|
»
»
Tree Conflict: local edit, incoming delete upon switch
|
View:
New views
2 Messages
—
Rating Filter:
Alert me
|
 |
Tree Conflict: local edit, incoming delete upon switch
by baby-6
::
Rate this Message:
In my project, I was working on the project trunk doing unit testing.
Then my tech leader told me to switch to a branch to work on new features. After switching to the branch (works great btw), my unit test folder became haunted. It now has a "+" sign and a "!" badge on the parent / tests folder. All the children directories have a "+" badge. A file I was working on in the trunk shows local modifications. Hovering over the parent /tests folder I see a tooltip with tons of info "Tree conflict: local edit, incoming delete upon switch". What I would expect is that the switch to the branch, which clearly doesn't have /tests, would render the /tests folder unversioned relative to the branch. What do I do? I want to get the /tests stuff into the branch without updating the entire branch from trunk... Also, was do I do about files with local state "History Scheduled" ? I realize these may be general svn questions and not SmartSVN questions per se. Thanks... ------------------------------------ Yahoo! Groups Links <*> To visit your group on the web, go to: http://groups.yahoo.com/group/smartsvn/ <*> Your email settings: Individual Email | Traditional <*> To change settings online go to: http://groups.yahoo.com/group/smartsvn/join (Yahoo! ID required) <*> To change settings via email: smartsvn-digest@... smartsvn-fullfeatured@... <*> To unsubscribe from this group, send an email to: smartsvn-unsubscribe@... <*> Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/ |
|
|
Re: Tree Conflict: local edit, incoming delete upon switch
by syntevo Support-3
::
Rate this Message:
> What I would expect is that the switch to the branch, which clearly
> doesn't have /tests, would render the /tests folder unversioned > relative to the branch. So your tests folder was added locally but not yet committed? Even in this case, the switch should preserve the scheduling for addition. Is it possible that the tests folder was added in a directory which exists (committed) on trunk, but not on the branch? This would explain the behavior you have seen. > What do I do? I want to get the /tests stuff into the branch without > updating the entire branch from trunk... I would have committed tests on trunk, if work was ready or committed unfinished work to a personal branch. Then working copy is clean, switch will work and in the branch you can merge those revisions from trunk resp. your personal branch which are necessary to get your tests-folder merged. -- Best regards, Marc Strapetz ============= syntevo GmbH http://www.syntevo.com http://blog.syntevo.com baby <baby@...> wrote: > In my project, I was working on the project trunk doing unit testing. > > Then my tech leader told me to switch to a branch to work on new > features. > > After switching to the branch (works great btw), my unit test folder > became haunted. It now has a "+" sign and a "!" badge on the parent / > tests folder. All the children directories have a "+" badge. A file I > was working on in the trunk shows local modifications. Hovering over > the parent /tests folder I see a tooltip with tons of info "Tree > conflict: local edit, incoming delete upon switch". > > What I would expect is that the switch to the branch, which clearly > doesn't have /tests, would render the /tests folder unversioned > relative to the branch. > > What do I do? I want to get the /tests stuff into the branch without > updating the entire branch from trunk... > > Also, was do I do about files with local state "History Scheduled" ? > > I realize these may be general svn questions and not SmartSVN > questions per se. > > Thanks... > > > ------------------------------------ > > Yahoo! Groups Links > > > > ------------------------------------ Yahoo! Groups Links <*> To visit your group on the web, go to: http://groups.yahoo.com/group/smartsvn/ <*> Your email settings: Individual Email | Traditional <*> To change settings online go to: http://groups.yahoo.com/group/smartsvn/join (Yahoo! ID required) <*> To change settings via email: smartsvn-digest@... smartsvn-fullfeatured@... <*> To unsubscribe from this group, send an email to: smartsvn-unsubscribe@... <*> Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/ |
| Free embeddable forum powered by Nabble | Forum Help |
