Mercurial > hg
view tests/test-merge1.out @ 9493:fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Wed, 30 Sep 2009 23:59:03 +0200 |
parents | d8143769e1d4 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head %% no merges expected changeset: 1:4ee19afe4659 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: commit #1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r d9e5953b9dec b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +This is file b1 M b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head %% merge should fail abort: untracked file in working directory differs from file in requested revision: 'b' %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r d9e5953b9dec b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +This is file b2 M b %% 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head Contents of b should be "this is file b1" This is file b1 %% merge fails abort: outstanding uncommitted changes (use 'hg status' to list changes) %% merge expected! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r c1dd73cbf59f b --- a/b +++ b/b @@ -1,1 +1,1 @@ -This is file b1 +This is file b22 M b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head %% merge of b should fail abort: outstanding uncommitted changes (use 'hg status' to list changes) %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r c1dd73cbf59f b --- a/b +++ b/b @@ -1,1 +1,1 @@ -This is file b1 +This is file b33 M b