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...
----- Original Message -----
From: "Ben Collins-Sussman" <sussman@collab.net>
To: "Labanca, Rick" <rick.labanca@studentuniverse.com>
Cc: "Rick LaBanca" <rickla1@cox.net>; <rick@ricklabanca.com>;
<users@subversion.tigris.org>
Sent: Thursday, July 29, 2004 8:22 PM
Subject: Re: log across copies?
> Labanca, Rick wrote:
>
> > Say I have the foo.c bug and I know its probably within the month. In
> > that month foo.c had 4 changes on the trunk, but 5 changes in each of
> > four other branches.
> >
> > With eclipse, I click for the history, and I get all the changes dumped
> > in one list.
>
> There's a concept here that I don't seem to be communicating well.
>
> In your example, suppose you notice your 'trunk' copy of foo.c has a
> bug, and as you say, 4 changes happened to foo.c on the trunk, and 5 on
> other branches.
>
> One of two things *must* be true:
>
> 1. the buggy change happened on the trunk, or
>
> 2. the buggy change happened on a branch, then the change was ported
> to the trunk.
>
> When you run 'svn log /trunk/foo.c', you see every change that ever
> happened to the trunk-line of foo.c.
>
> If #1 is true, then the log will include the buggy change.
>
> If #2 is true, then nothing is different: the log will *still* show the
> buggy change. The change will simply have more history behind it,
> history that (if you wish) can trace back to a branch.
>
> Either way, the procedure for finding the bug is the same. It's equally
> simple.
>
> If you had the ability to ask Subversion, "show me every change that
> ever happened to foo.c on *any* branch anywhere" (just as you do with
> 'cvs history') you'd get a much larger log of changes, that's true --
> but it's just extra noise that you don't need. It's *not* helping you
> find the bug. Everything you need is already in the output of 'svn log
> /trunk/foo.c'.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 30 06:47:56 2004