Data loss

[Matt Mackall]

On Tue, Jun 07, 2005 at 11:38:37AM -0700, Arun Sharma wrote:
> $ mkdir r1
> $ cd r1
> $ hg init
> $ echo a >> a
> $ hg addremove
> $ export EDITOR=ed
> $ hg commit
> 74
> a
> a
> .
> w
> 76
> q
> $ cd ..
> $ mkdir r2
> $ cd r2
> $ hg branch ../r1
> $ hg up
> $ ls
> a
> $ ed a
> 2
> a
> abc
> .
> w
> 6
> q
> $ cat a
> a
> abc
> $ hg diff
> --- a/a Tue Jun  7 18:37:49 2005
> +++ b/a Tue Jun  7 11:38:24 2005
> @@ -1,1 +1,2 @@
>  a
> +abc
> $ cd ../r1
> $ echo b >> b
> $ hg addremove
> $ hg commit
> 74
> a
> b
> .
> w
> 76
> q
> $ cd -
> /home/adsharma/t/hg/r2
> $ hg merge ../r1
> searching for changes
> adding changesets
> adding manifests
> adding file revisions
> modified 1 files, added 1 changesets and 1 new revisions
> $ hg up
> $ hg diff
> 
> Now my diff to a has been lost!

I'll try to reproduce this shortly.

-- 
Mathematics is the supreme nostalgia of our time.