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

Re: log across copies?

From: Erik Anderson <erikba_at_teamworkgroup.com>
Date: 2004-07-30 18:54:09 CEST

Quick comment after reading the webpage:

CVS-nt also has a solution to #A where people only have to specify the
branch name to merge from. CVS-nt remembers the point that the merge was
brought up to, and subsequent merge requests will start at the remembered
spot.

----- Original Message -----
From: "Ben Collins-Sussman" <sussman@collab.net>
To: "Erik Anderson" <erikba@teamworkgroup.com>
Cc: <users@subversion.tigris.org>
Sent: Friday, July 30, 2004 7:30 AM
Subject: Re: log across copies?

> On Thu, 2004-07-29 at 23:47, Erik Anderson wrote:
> > What if subversion kept track of all the merge commands that had been
made
> > into a working directory and marked the list down in an unversioned
property
> > in the next commit? It wouldn't interfere with current functionality at
all
> > but would give some record that could be looked up as described here...
>
> and
>
> On Fri, 2004-07-30 at 03:40, Tristan Seligmann wrote:
>
> > Still, it would be nice to see where the data used in a merge operation
> > came from logically, even if the physical data present in the file after
> > the change is not identical to either of the ancestors used in the merge
> > operation. If I understand correctly, svn 1.1 will be equipped to deal
> > with this kind of merge tracking.
>
> and
>
> On Thu, 2004-07-29 at 22:50, Rick LaBanca wrote:
>
> > I understand I can get that detail, but if the dev hasn't commented
which
> > branch it came from, I have to figure that out right? Then I have to log
> > that branch.
>
> I absolutely agree with you guys. This is exactly why need "real merge
> tracking" in Subversion, or at least one form of it. If the person
> porting the change forgets to write a commit-message that describes
> where the merge came from, then everything falls apart. The system
> should be doing that for us.
>
> There are some notes on merge-tracking problems here, for those curious:
>
> http://svn.collab.net/repos/svn/trunk/notes/merge-tracking.txt
>
> My next big "push" on the dev@ list, though, will be for an exclusive
> locking feature, hopefully done over the next few months. (Merge
> tracking is on my horizon after that.)
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 30 18:49:03 2004

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