[Extension] Dirty hack of 'shelve' and 'unshelve' command

[Michael Ellerman]

On Thu, 19 May 2005 20:18, Erik Bågfors wrote:
> dos line ending.  That doesn't work very good in the shebang on unix.

Hmm, it looks ok on my end, perhaps your mailer munged it? Did anyone else 
have this problem I wonder?

> "perl -i.bak -pe 's/\r//g' *" solved the problem

apt-get install sysutils; dos2unix <file>
apt-get remove --purge perl; echo "just kidding =D"

> Anyway, using this did not work as I was expecting. I did four changes
> to a file in the repo, at four different lines not connected. Then did
> "bzr shelve" and all four were shown as one patch.  Compared to darcs
> where each change would have been one "change" that I could commit or
> not.
>
> : [bagfors at zyrgelkwyt]$ ; bzr shelve
>
> passwd
> @@ -2,20 +2,20 @@
>  daemon:x:1:1:daemon:/usr/sbin:/bin/sh
>  bin:x:2:2:bin:/bin:/bin/sh
>  sys:x:3:3:sys:/dev:/bin/sh
> -sync:x:4:65534:sync:/bin:/bin/sync
> +ljlkjlkj
>  games:x:5:60:games:/usr/games:/bin/sh
>  man:x:6:12:man:/var/cache/man:/bin/sh
>  lp:x:7:7:lp:/var/spool/lpd:/bin/sh
>  mail:x:8:8:mail:/var/mail:/bin/sh
> -news:x:9:9:news:/var/spool/news:/bin/sh
> +lkjlkjj
>  uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
>  proxy:x:13:13:proxy:/bin:/bin/sh
>  www-data:x:33:33:www-data:/var/www:/bin/sh

Well that's what a "normal" diff does. The three lines of context for each 
change overlap, so it combines them. I haven't had time to see if difflib can 
be convinced not to do that. I agree darcs behaviour is better for this 
usage, but normally you want what bzr diff gives - ie. a combined diff.

cheers

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person