"Sergey A. Lipnevich" <sergey@optimaltec.com> writes:
> Yes it is, thanks! The question was slightly different, however. Let's
> say I create a branch by rev r16, then commit two revisions on branch,
> r17 and r18, and merge r17 into trunk by revision r32, and then
> "rebranch:" delete the branch (r33) and copy the trunk over (r34). The
> change r18 is left out in the "old" branch. Now, I go to a branch root
> and do a merge of r16:32, because I do not want to dig out what
> exactly changes have been left out after merging with trunk and
> rebranching. This merge is going to give me r17 changes back, now on
> the new branch, that's for sure. But, is this merge going to create
> any conflicts, and if yes, why? Is r17 going to introduce a conflict
> "with itself?"
I'm not sure how to answer this, except to say "Don't do things that
way." :-)
If you merge only part of a branch into trunk, and then delete the
branch, then yes, you have to keep track of what things you didn't
merge, so you can do them later.
Changes won't conflict with themselves, if neither they nor their
context changed in the destination. But why ask for trouble? I think
the simplest thing is to minimize the number of times the same change
must be ported from one line of development to another. Whenever you
can get a change via an implied copy, that's better.
Specifically, whenever you find yourself porting a change back to a
line that *already has the change*, you should be suspicious. (It
would be nice if Subversion did the bookkeeping for you, but it
doesn't.)
> Saving changes with `svn diff' is difficult to explain to a non-caring
> colleague who just wants the version control system to be out of the
> way, so I'd prefer the scenario I described above, if it works.
It's fine to do it at home, just please not in Subversion's own tree
:-). I'm mainly trying to have 'svn log -v' and 'svn diff' give
accurate pictures of what has changed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 19 23:47:25 2003