Mercurial Mercurial > hg-stable / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-remove.out
changeset 3645 b984dcb1df71
parent 3199 096f1c73cdc3
child 4392 9770d260a405
equal deleted inserted replaced
3644:b7547efe78fb 3645:b984dcb1df71 
    35 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
    35 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
    36 +++ b/foo	Mon Jan 12 13:46:40 1970 +0000
 
    36 +++ b/foo	Mon Jan 12 13:46:40 1970 +0000
 
    37 @@ -0,0 +1,1 @@
 
    37 @@ -0,0 +1,1 @@
 
    38 +a
 
    38 +a
 
    39 
    39 
    40 
       
    41 changeset:   1:a1fce69c50d9
 
    40 changeset:   1:a1fce69c50d9
 
    42 tag:         tip
 
    41 tag:         tip
 
    43 user:        test
 
    42 user:        test
 
    44 date:        Mon Jan 12 13:46:40 1970 +0000
 
    43 date:        Mon Jan 12 13:46:40 1970 +0000
 
    45 summary:     2
 
    44 summary:     2
 
    48 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
 
    47 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
 
    49 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
    48 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
    50 @@ -1,1 +0,0 @@
 
    49 @@ -1,1 +0,0 @@
 
    51 -a
 
    50 -a
 
    52 
    51 
    53 
       
    54 not removing a: file has been marked for add (use -f to force removal)
 
    52 not removing a: file has been marked for add (use -f to force removal)
 
    55 adding a
 
    53 adding a
 
    56 adding b
 
    54 adding b
 
    57 not removing b: file is modified (use -f to force removal)
 
    55 not removing b: file is modified (use -f to force removal)
 
    58 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    56 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
hg-stable