Something like "darcs record" / "hg record" == Select changes to commit.

Marius Gedminas marius at pov.lt
Thu Jun 7 15:16:07 UTC 2012


On Thu, Jun 07, 2012 at 04:20:22PM +0900, Stephen J. Turnbull wrote:
> Daniel Carrera writes:
> 
>  > You see... unless I'm just confused about how shelf works, "koala"
>  > and "wolf" are together even though they are three lines apart.
> 
> Ah, OK, so it uses a standard(-ish) unidiff with context 3.  That's
> not going to be trivial to fix completely (I don't know if even Darcs
> allows selecting lines one by one), but maybe you can easily tell bzr
> to use context=0.  That would at least allow you to handle the
> wolf/koala example.

git add -p solves this perfectly by providing a (s)plit command that
splits the hunk into several smaller ones.

(And I like the (e)dit command that lets me edit the *unified diff* --
this is quite different from bzr shelve's vimdiff support.)

Marius Gedminas
-- 
Hi. I'm the "I love you" .signature virus. You have been infected.
Please panic immediately.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20120607/637bc9e0/attachment.pgp>


More information about the bazaar mailing list