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

Re: gcc source management requirements

From: Peter Davis <peter_at_pdavis.cx>
Date: 2002-12-10 20:01:54 CET

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Tuesday 10 December 2002 04:04, Robert North wrote:
> > what happens when you've finished merging the various changes in
> > your microbranch, but someone else has made changes to the HEAD tree and
> > the microbranch itself becomes out of date? When you commit it, do you
> > get a micro-microbranch?
>
> My assumption would be that best practice says: work on the trunk, if
> possible. So, normally you'd only have the contents of a single commit on
> your branch, followed by an update fron the trunk, some conflict
> resoloution, and a commit to the trunk.

I still see a problem there. Doing the conflict resolution in the branch
takes time, during which someone else could have made another commit to the
trunk. Once that happens, the branch would be out of date, and when
committing the merged changes from the branch to trunk, it'd have to create a
new branch to resolve the new conflicts.

Maybe there's nothing technically impossible about that, but it would be
annoying. On the other hand, the chances of that happening would be rare
(even for a large project).

- --
Peter Davis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE99joihDAgUT1yirARAhlwAKCfB+IgqKUWhF+3KAFsjKdqSGt3bwCePiJr
lME8oL4e5aZ+ZMvrEp9xd3c=
=p1VA
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 10 20:02:40 2002

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