[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Question regarding merging branches

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-09-06 15:47:58 CEST

"Dylan Cuthbert" <dylan@q-games.com> writes:

> I get this when I do a merge:
>
> $ svn merge http://svnserver/svn/repo/branches/test-branch/projects . <=
> note the "."
> _ Makefile

Hmmmm, it looks like you issued the command correctly. Was your
Makefile changed at all? Run 'svn diff Makefile' to see if it
received any changes. I suspect that you should have seen an "M"
instead of a "_" during the merge, and it may just be a display bug.

> Shouldn't I get a conflict to fix?

You should only get a conflict if the Makefile in your working copy
has *local mods* that conflict with the difference that 'svn merge' is
trying to fold in. If your working Makefile is unchanged, then poof,
the differences between the two files will be applied without a
problem; you'll end up with a Makefile that looks identical to the
one on the branch.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 6 15:49:58 2002

This is an archived mail posted to the Subversion Dev mailing list.