[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 01:54:12 CEST

On Fri, Apr 18, 2003 at 06:36:39PM -0700, Mike Migurski wrote:
> >
> > svn merge -r23:HEAD file:///path/to/branch/branch4 .
>
> Yes, I did notice this - it begs the question, how might one avoid having
> to explicitly type the full repository path everytime? I realize this only
> really comes up when branches are dealt with, but is there a shorthand for
> specifying the current repository, or at least the file://path/to/rep./
> part? My repository path is long, and the file:// part means that
> autocomplete doesn't work. I can set environment variables, but they will
> work for only one repository at a time.

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,
and then run
  svn command `getrepo`

or something along those lines. of course, you really want the
corresponding branch path to a path on the trunk, which is a harder
problem, although with an appropriate choice of conventions it
shouldn't be difficult.

> That, and there's fewer of them, allowing for quick-n-easy scans of the
> output of cvs status - this is the chief way I use them. I usually have
> some seminal file at the module root (Makefile, typically) which I can
> count on to contain every tag applied throughout the module's history.
>
> I realize this is an inelegant hack. :)

i'm not sure i follow you, but if you are already tracking tag names in
a file which you maintain by hand or by script, it should be a simple
matter to maintain such a file which contains revision numbers.

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

i tried something like the above and got the same results for the two
commands, but it was a very simple case and quite probably not an
adequate test.

 
-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 01:50:25 2003

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