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

Re: A question about merging and conflicts

From: Brian Denny <brian_at_briandenny.net>
Date: 2003-04-26 04:54:45 CEST

On Fri, Apr 25, 2003 at 06:55:32PM -0500, Ben Collins-Sussman wrote:
>
> > > > svn merge file:///path/to/tag file://path/to/branch
> > > >
> > > >... i havent tried it myself, but i can't think of why it wouldn't work.
> > > >although personally, i'd probably just write down the branch revnum --
> > > >seems easier.
> > >
> > > This was one of the other methods I tried - I haven't investigated it
> > > completely, but the behavior i was initially getting seemed to suggest
> > > that it could tell what the difference between tag/ and branch/ was, but
> > > not that those differences had any relation to what was going on in trunk/
> > > (the current directory at the time).
> >
> > i am the wrong person to be answering this question, because i'm not
> > thoroughly familiar with the ins and outs of branching and merging,
> > myself. anyone?
>
> What was the problem here?

if i understood Mike correctly, he wants to use a tag instead of a
revnum to specify what to merge.

-brian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Apr 26 04:51:04 2003

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