[MERGE][0.8] break-lock command

[Martin Pool]

On  4 May 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> Robert Collins wrote:
> > This is also available at http://bazaar-vcs.org/bzr/break-lock.
> > 
> > diffstat follows: note the strange presence of 'b' in just the new
> > files. I think think diff prefix patch is buggy :p.
> > 
> 
> Well diffstat seems a little buggy. But the rest of the files all have > an
a/NEWS, b/NEWS.  > I think the reason might be that you are comparing /dev/null
to > b/bzrlib/tests/...
> 
> And diffstat doesn't see an obvious prefix for /dev/null (but we
> certainly shouldn't be writing it a/dev/null)

diff does this by showing a diff from an empty file in a:

% mkdir a b
% date > b/foo
% diff -Nur a b
diff -Nur a/foo b/foo                                                                                                                                                                   
--- a/foo       1970-01-01 10:00:00.000000000 +1000
+++ b/foo       2006-05-05 10:44:40.000000000 +1000                                                                                                                                     
@@ -0,0 +1 @@
+Fri May  5 10:44:40 EST 2006                                                                                                                                                           

And svn does something similar, though without the prefix.  I thought /dev/null
was needed to indicate creation of new files, but perhaps not.  We may need to
put the epoch date there for patch to do the right thing.  

  https://launchpad.net/products/bzr/+bug/43033

-- 
Martin