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-push-warn.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 14 Mar 2006 21:40:46 -0800
changeset 1951 696230e52e4d
parent 1043 9344f5dd4488
child 2019 ced2d3620f95
permissions -rw-r--r--
add HGRCPATH env var, list of places to look for hgrc files. if set, override default hgrc search path. if empty, only .hg/hgrc of current repo read. for each element, if directory, all entries in directory with end in ".rc" are added to path. else, element is added to path. big thing about this change is that user "~/.hgrc" and system hgrc not longer breaks tests. run-tests makes HGRCPATH empty now.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     1
 
pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     2
 
searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     3
 
abort: unsynced remote changes!
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     4
 
(did you forget to sync? use push -f to force)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     5
 
pulling from ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     6
 
searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     7
 
adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     8
 
adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     9
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 990
diff changeset 
    10
 
added 1 changesets with 1 changes to 1 files (+1 heads)
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    11
 
(run 'hg update' to get a working copy)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    12
 
pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    13
 
searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    14
 
abort: push creates new remote branches!
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    15
 
(did you forget to merge? use push -f to force)
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    16
 
pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    17
 
searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    18
 
adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    19
 
adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    20
 
adding file changes
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 925
diff changeset 
    21
 
added 2 changesets with 1 changes to 1 files
mercurial-crew-with-dirclash