On Sep 21, 2009, at 00:04, Gavin 'Beau' Baumanis wrote:
> I have used;
> svn merge -c 1200 ...
> and it didn't seem to work.
> I got a lot of conflicts.
> I can't think of the exact use-case.... perhaps it was something odd
> like trying to a merge a specific change from customer1 to customer2
> that caused the issue... - I really can't remember....
> But needless to say it turned out to be a really painful and manual
> exercise... so much so that I have pretty much only ever merged a
> file that was at head to the production branch.
It all depends on what changes have happened since then. For example,
if you are trying to merge changeset 1200 from trunk into the branch
now, but other changes have been made to those files in the branch
since then, then changeset 1200 might not apply cleanly anymore. Or if
you're trying to merge changeset 1200 from trunk into the branch, but
that changeset depended on prior changes on trunk that you haven't
merged yet, then you'll get conflicts. When conflicts occur, you must
resolve them manually. Hopefully by looking at the diffs of the
conflict files Subversion produces, you'll be able to see what edits
you need to make, or perhaps learn that you need to undo that merge
and first merge some earlier revisions.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2397203
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-21 07:10:36 CEST