[Fwd: [Gnu-arch-users] star-merge and commit on one file only]

[John A Meinel]

I just saw this show up on the Arch mailing list, and I realized it is
something that we should probably think about for bzr.
If I do a merge, and then try to do a partial commit, it seems like the
merge shouldn't count.
I don't know that there is much that we can do, other than say
"shelf/revert" first, and then make your change, and then redo the
merge. (Hopefully revert will allow for making an redo changeset in the
future)

Anyway, I don't know that we will have a whole lot to say about it, just
that we should probably think about it.

John
=:->


-------- Original Message --------
Subject: [Gnu-arch-users] star-merge and commit on one file only
Date: Fri, 15 Jul 2005 15:12:31 +0200
From: Aldrik KLEBER <aldrik.kleber at tiscali.fr>
To: Arch Users <gnu-arch-users at gnu.org>

I use the star-merge command, I began to work and next I found a bug on
a file
that was not part of my current task.

So I fixe the bug, but when I have make :
tla commit -s "summary" -L  "explanation"  -- the_fixed_file

Arch include the changesets of the merge, but I didn't want those
changeset
to be included in this commit, only the the fix on the file I selected.

What is the good approach I must have to commit only one file after a
star-merge on a project tree ?



_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users at gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050715/6841ea82/attachment.pgp