-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
It helps when I remember to reply to all... :-/
On Friday 08 February 2002 02:01 pm, Billy Tanksley wrote:
...
> to this from 'bk smerge'
>
> <<<<<<< local slib.c 1.642.1.6 vs 1.645
> sc = sccs_init(file, INIT_NOCKSUM|INIT_SAVEPROJ, s->proj);
> - assert(sc->tree);
> - sccs_sdelta(sc, sc->tree, file);
> + assert(HASGRAPH(sc));
> + sccs_sdelta(sc, sccs_ino(sc), file);
> <<<<<<< remote slib.c 1.642.1.6 vs 1.642.2.1
> - sc = sccs_init(file, INIT_NOCKSUM|INIT_SAVEPROJ, s->proj);
> + sc = sccs_init(file, INIT_NOCKSUM|INIT_SAVEPROJ, p);
> assert(sc->tree);
> sccs_sdelta(sc, sc->tree, file);
Ick. Quoting mess. Anyway, this /is/ nice, and does preserve information.
> without actually having to display the original source. I'd like his
> format a bit better if he supported a notation for changes "!" instead
> of/as well as a notation for additions/deletions. In my hypothetical
> notation, the above would be:
>
> <<<<<<< local slib.c 1.642.1.6 vs 1.645
> sc = sccs_init(file, INIT_NOCKSUM|INIT_SAVEPROJ, s->proj);
> ! assert(HASGRAPH(sc));
> ! sccs_sdelta(sc, sccs_ino(sc), file);
> <<<<<<< remote slib.c 1.642.1.6 vs 1.642.2.1
> ! sc = sccs_init(file, INIT_NOCKSUM|INIT_SAVEPROJ, p);
> assert(sc->tree);
> sccs_sdelta(sc, sc->tree, file);
>
>
> As you can see, the original text is preserved.
I'm not going to try to mess with the logic for determining when you can use
one (!) or the other (+-) without losing information for the first release.
> I'm glad to hear that. I've always hated having to look back and forth to
> figure out which version I was looking at.
Yeah, me too.
Doing it BitKeeper's way is a bit more complex than the way I'm doing it,
because I'll have to do the three-way merge myself, using only diff
information :-/. I'm just going to try to get the basic functionality
working, then I'll tweak it.
- - --
|.. "Familiarity breeds contempt, but without a little familiarity it's
<|> impossible to breed anything."
/|\ --- Noel Coward
/|
|
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE8ZFiWP0KxygnleI8RAugSAKCRRhYGtP6dhfFP0QO9PjEG5w9dFACgrCNu
kGuhZZK13qCWGuMEhLGXfDY=
=Vjc0
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006