Re: Unexpected tree conflict after merge

On Thu, Nov 12, 2009 at 12:30:31PM +0100, Stefan Sperling wrote:
> E.g. you can merge
> changes made in rX to foo/bar.c on monday and changes made in rX to
> bloo/baz.c on wednesday, and Subversion will automatically track what
> you've done.

Note that in this example, rX affected both foo/bar.c and bloo/baz.c
when rX was committed. Individual changes committed as part of rX are
then merged to other branches.

What I wrote could also be read as "merging all of rX into foo/bar.c on
monday, and merging all of rX again into bloo/baz.c on wednesday", but
that's not what I meant to say. It's still a valid interpretation however,
e.g. rX could be a one-line bug fix fixing a bug in some file on trunk,
a bug which also happened to occur in both foo/bar.c and bloo/baz.c on
another branch. Subversion would track such merges, too, with the
caveats I mentioned.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2417006

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-12 13:34:26 CET