Mercurial Mercurial > hg / 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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 08 Feb 2010 19:44:04 +0100
changeset 10396 65a90c8e11ee
parent 10371 eacfff116e17
child 10771 01f097c4ae66
permissions -rw-r--r--
prepush: add more precise error messages Part of the patch is from timeless@mozdev.org - indicate the branch name where there are multiple heads - give better advice when hitting a possible race, where new heads are added between discovery and the call to branchmap(). In that case, asking the user to merge isn't helpful, since only remote has the changes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9609
diff changeset 
     1
 
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
     2
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     3
 
pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     4
 
searching for changes
10396
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
     5
 
abort: push creates new remote heads on branch 'default'!
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
     6
 
(you should pull and merge or use push -f to force)
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     7
 
pulling from ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     8
 
searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
     9
 
adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    10
 
adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    11
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 990
diff changeset 
    12
 
added 1 changesets with 1 changes to 1 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1043
diff changeset 
    13
 
(run 'hg heads' to see heads, 'hg merge' to merge)
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    14
 
pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    15
 
searching for changes
10396
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
    16
 
abort: push creates new remote heads on branch 'default'!
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    17
 
(did you forget to merge? use push -f to force)
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
    18
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
    19
 
(branch merge, don't forget to commit)
816
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    20
 
pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    21
 
searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    22
 
adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    23
 
adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads
mpm@selenic.com
parents:
diff changeset 
    24
 
adding file changes
7460
3342e6ada4b9 push: use the fast changegroup() path on push
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 7233
diff changeset 
    25
 
added 2 changesets with 1 changes to 1 files
2021
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    26
 
adding foo
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9609
diff changeset 
    27
 
updating to branch default
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
    28
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
    29
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6181
diff changeset 
    30
 
created new head
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
    31
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6181
diff changeset 
    32
 
created new head
2021
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    33
 
merging foo
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
    34
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2109
diff changeset 
    35
 
(branch merge, don't forget to commit)
2021
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    36
 
pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    37
 
searching for changes
10396
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
    38
 
abort: push creates new remote heads on branch 'default'!
2021
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    39
 
(did you forget to merge? use push -f to force)
6098
65340b8231eb push: exit(1) if "push creates new remote branches!"
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3923
diff changeset 
    40
 
1
2021
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    41
 
pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    42
 
searching for changes
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    43
 
no changes found
3803
2aef481ac73c Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3684
diff changeset 
    44
 
0
2021
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    45
 
pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    46
 
searching for changes
10396
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
    47
 
abort: push creates new remote heads on branch 'default'!
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
    48
 
(you should pull and merge or use push -f to force)
6098
65340b8231eb push: exit(1) if "push creates new remote branches!"
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3923
diff changeset 
    49
 
1
3803
2aef481ac73c Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3684
diff changeset 
    50
 
pushing to ../c
2aef481ac73c Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3684
diff changeset 
    51
 
searching for changes
10396
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
    52
 
abort: push creates new remote heads on branch 'default'!
3803
2aef481ac73c Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3684
diff changeset 
    53
 
(did you forget to merge? use push -f to force)
6098
65340b8231eb push: exit(1) if "push creates new remote branches!"
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3923
diff changeset 
    54
 
1
3684
975c2469c316 correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents: 2424
diff changeset 
    55
 
pushing to ../c
975c2469c316 correct remote heads test in prepush
Matt Mackall <mpm@selenic.com>
parents: 2424
diff changeset 
    56
 
searching for changes
2109
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset 
    57
 
adding changesets
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset 
    58
 
adding manifests
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset 
    59
 
adding file changes
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset 
    60
 
added 2 changesets with 2 changes to 1 files (+2 heads)
3803
2aef481ac73c Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3684
diff changeset 
    61
 
0
2021
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    62
 
pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset 
    63
 
searching for changes
2109
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset 
    64
 
adding changesets
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset 
    65
 
adding manifests
1b183976e007 Revert push new heads logic
Matt Mackall <mpm@selenic.com>
parents: 2021
diff changeset 
    66
 
adding file changes
2424
092039246d73 Report on push/pull if heads are merged, too, like for new heads.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2175
diff changeset 
    67
 
added 1 changesets with 1 changes to 1 files (-1 heads)
3803
2aef481ac73c Don't report an error when closing heads during local push (issue387)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3684
diff changeset 
    68
 
0
3923
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    69
 
pushing to ../e
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    70
 
searching for changes
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    71
 
adding changesets
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    72
 
adding manifests
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    73
 
adding file changes
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    74
 
added 1 changesets with 1 changes to 1 files
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    75
 
0
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    76
 
pushing to ../e
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    77
 
searching for changes
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    78
 
adding changesets
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    79
 
adding manifests
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    80
 
adding file changes
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    81
 
added 1 changesets with 1 changes to 1 files
27230c29bfec fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3803
diff changeset 
    82
 
0
8565
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
    83
 
% issue 736
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
    84
 
% push on existing branch and new branch
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
    85
 
pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
    86
 
searching for changes
10371
eacfff116e17 strip apostrophes from an error messages
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 10354
diff changeset 
    87
 
abort: push creates new remote branches: c!
10354
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    88
 
(use 'hg push -f' to force)
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    89
 
1
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    90
 
pushing to ../f
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    91
 
searching for changes
10371
eacfff116e17 strip apostrophes from an error messages
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 10354
diff changeset 
    92
 
abort: push creates new remote branches: c!
10354
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    93
 
(use 'hg push -f' to force)
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    94
 
1
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    95
 
% multiple new branches
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    96
 
pushing to ../f
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    97
 
searching for changes
10371
eacfff116e17 strip apostrophes from an error messages
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 10354
diff changeset 
    98
 
abort: push creates new remote branches: c, d!
10354
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
    99
 
(use 'hg push -f' to force)
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
   100
 
1
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
   101
 
pushing to ../f
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
   102
 
searching for changes
10371
eacfff116e17 strip apostrophes from an error messages
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 10354
diff changeset 
   103
 
abort: push creates new remote branches: d!
10354
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9954
diff changeset 
   104
 
(use 'hg push -f' to force)
8565
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   105
 
1
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   106
 
% fail on multiple head push
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   107
 
pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   108
 
searching for changes
10396
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
   109
 
abort: push creates new remote heads on branch 'a'!
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
   110
 
(you should pull and merge or use push -f to force)
8565
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   111
 
1
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   112
 
% push replacement head on existing branches
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   113
 
pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   114
 
searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   115
 
adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   116
 
adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   117
 
adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   118
 
added 2 changesets with 2 changes to 1 files
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   119
 
0
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   120
 
% merge of branch a to other branch b followed by unrelated push on branch a
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   121
 
pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   122
 
searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   123
 
adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   124
 
adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   125
 
adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   126
 
added 1 changesets with 1 changes to 1 files (-1 heads)
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   127
 
0
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   128
 
pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   129
 
searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   130
 
adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   131
 
adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   132
 
adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   133
 
added 1 changesets with 1 changes to 1 files (+1 heads)
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   134
 
0
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   135
 
% cheating the counting algorithm
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   136
 
pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   137
 
searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   138
 
adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   139
 
adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   140
 
adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   141
 
added 2 changesets with 2 changes to 1 files
268d16b2ec25 tests: add tests for new pre-push logic (issue736)
Sune Foldager <cryo@cyanite.org>
parents: 7460
diff changeset 
   142
 
0
9479
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   143
 
% checking prepush logic does not allow silently pushing multiple new heads
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   144
 
adding init
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   145
 
adding a
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9609
diff changeset 
   146
 
updating to branch default
9609
aa404f3f661b tests: fix inadvertent use of existing test repository
Henrik Stuart <hg@hstuart.dk>
parents: 9479
diff changeset 
   147
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
aa404f3f661b tests: fix inadvertent use of existing test repository
Henrik Stuart <hg@hstuart.dk>
parents: 9479
diff changeset 
   148
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9479
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   149
 
adding b
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   150
 
created new head
9609
aa404f3f661b tests: fix inadvertent use of existing test repository
Henrik Stuart <hg@hstuart.dk>
parents: 9479
diff changeset 
   151
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9479
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   152
 
adding c
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   153
 
created new head
9609
aa404f3f661b tests: fix inadvertent use of existing test repository
Henrik Stuart <hg@hstuart.dk>
parents: 9479
diff changeset 
   154
 
pushing to h
9479
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   155
 
searching for changes
10396
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
   156
 
abort: push creates new remote heads on branch 'default'!
65a90c8e11ee prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10371
diff changeset 
   157
 
(you should pull and merge or use push -f to force)
9479
f3569d95c2ab push: fix subtle bug in prepush logic
Sune Foldager <cryo@cyanite.org>
parents: 8565
diff changeset 
   158
 







9954






d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   159


% check prepush logic with merged branches













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   160


marked working directory as branch a













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   161


adding foo













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   162


updating to branch a













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   163


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   164


marked working directory as branch b













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   165


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   166


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   167


(branch merge, don't forget to commit)













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   168


pushing to j













d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   169


searching for changes








10396






65a90c8e11ee
prepush: add more precise error messages



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
10371

diff
changeset




   170


abort: push creates new remote heads on branch 'a'!













65a90c8e11ee
prepush: add more precise error messages



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
10371

diff
changeset




   171


(you should pull and merge or use push -f to force)








9954






d6a307719ccb
fix bug in prepush logic involving merge changesets



Sune Foldager <cryo@cyanite.org>


parents: 
9611

diff
changeset




   172
















Mercurial