[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-26 01:55:32 CEST

Brian Denny <brian@briandenny.net> writes:

> well, i don't know if this will give you what you want, but...
> for a given WCDIR, WCDIR/.svn/entries contains among other things
> the repository URL corresponding to WCDIR. you might be able to
> write a shell script that would extract this bit of information,

$ svn info | grep Url
Url: http://svn.collab.net/repos/svn/trunk

> > > 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?

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

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