Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Threaded View
Accumulo >> mail # user >> Switching From Trunk To Branch 1.3.5 (docs/config.html overwritten?)

Copy link to this message
Re: Switching From Trunk To Branch 1.3.5 (docs/config.html overwritten?)

I have a git-svn checkout of accumulo and ran the following

git svn show-ignore > .gitignore

Attached is the result.  Takes a little while to run and could possibly be
cleaned up, but this is the result.

Accumulo devs, would you be willing to include a .gitignore file in the svn
repo to facilitate using the github and apache git mirrors?  If so, I'll
create a jira ticket.


On Wed, Dec 28, 2011 at 4:33 PM, David Medinets <[EMAIL PROTECTED]>wrote:

> Based on an earlier suggestion from this list, I wanted to switch to
> branch 1.3.5. However, I ran into an error message. This is obviously
> not a critical issue, but my understanding is that switching between
> branches when I have not made any changes should be message-free.
> Here is the sequence of steps that I executed:
> git clone https://github.com/apache/accumulo.git
> cd accumulo
> mvn package
> # This was successful with Java 7, by the way.
> # So now l remembered that I wanted to use the 1.3.5 branch.
> $ git checkout 1.3.5
> error: The following untracked working tree files would be overwritten
> by checkout:
>        docs/config.html
> Please move or remove them before you can switch branches.
> Aborting
> $ git branch
> * trunk
> Am I incorrect that something created the config.html file during the
> package process and that it should be in the .gitignore file?