Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
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-default-push.out
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 2496 6dbb8ae0a0b3
permissions -rw-r--r--
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding a
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     3
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
% push should push to default when default-push not set
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
pushing
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
searching for changes
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
adding changesets
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
adding manifests
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     9
 
adding file changes
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
added 1 changesets with 1 changes to 1 files
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
% push should push to default-push when set
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    12
 
pushing
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    13
 
searching for changes
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
adding changesets
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
adding manifests
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    16
 
adding file changes
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    17
 
added 1 changesets with 1 changes to 1 files
mercurial-crew-with-dirclash