Re: Subversion Merge

Please keep follow postings to the mailing list so that others may
participate in the discussion and those searching the archive benefit
from the answers produced. Thanks.

Ram, Chrishneel N wrote:
> Thanks for the response. What I wanted to do was the following:
>
> A B
> \ /
> C
>
> Where A, B, C are files, not directories.

My examples were discussing files. Although in a general case a
directory of files fits the model too.

> I suppose from the example that you gave this would be merging A2 and B2
> and making A3.

What would be the basis of a merge there? Perhaps what you really
want to do is to concatenate the files?

  cat A B > C
  svn add C
  svn commit -m "* C: New file." C

???

You don't seem to be merging. Perhaps a more explicit and complete
example would help clarify things.

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 27 18:23:12 2006