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 Vincent Danjean
Fri, 23 Sep 2005 18:59:16 -0700
changeset 1341 3ab6e55ee361
parent 1043 9344f5dd4488
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix copyright symbol in docs --- hg.orig/doc/hg.1.txt 2005-09-22 09:40:47.000000000 -0700 +++ hg/doc/hg.1.txt 2005-09-23 18:31:58.000000000 -0700 @@ -802,6 +802,6 @@ http://selenic.com/mailman/listinfo/merc COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL). Index: hg/doc/hgmerge.1.txt =================================================================== --- hg.orig/doc/hgmerge.1.txt 2005-06-30 10:19:51.000000000 -0700 +++ hg/doc/hgmerge.1.txt 2005-09-23 18:31:59.000000000 -0700 @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright (C) 2005 Matt Mackall. +Copyright \(C) 2005 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).
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