-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Wednesday 22 December 2004 07:12 am, Thomas Charron wrote:
> On Wednesday 22 December 2004 03:05 am, Neil Stevens wrote:
> > The idea makes merging harder because it adds unnecessary conflicts
> > (as any two branches will have conflicts in the Id line), and isn't
> > necessary to acheive your goal of knowing what version was checked
> > out. The sandbox
>
> Umm.. $Id$ does NOT add any additional conflicts. It's a special
> text string that is actually stored and considered to be, $Id$, and NOT
> the string that the version represents. The string presented is the one
> the sandbox considers it to be, and it allows the version information to
> be present in CVS exports for release builds and the such..
That only applies when you're using CVS as your only tool, which rules out
such nifty things as graphical three-way mergers.
- --
Neil Stevens - [EMAIL PROTECTED]
"The world is a dangerous place to live; not because of the people who
are evil, but because of the people who don't do anything about it."
-- Albert Einstein(?)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (FreeBSD)
iD8DBQFByY7Ef7mnligQOmERAq98AKCMrghwJDaDjr43n6EihKrhv9RApgCdHZ5a
pHcZaUZ0pmXiTk8m+L2++GI=
=qOw8
-----END PGP SIGNATURE-----
_______________________________________________
jdev mailing list
[email protected]
http://mail.jabber.org/mailman/listinfo/jdev
