← Back to branch summary

~ubuntu-branches/ubuntu/precise/mercurial/precise-updates

« back to all changes in this revision

Viewing changes to tests/test-bookmarks-pushpull.t

  • Committer: Bazaar Package Importer
  • Author(s): Javi Merino
  • Date: 2011-03-06 16:01:58 UTC
  • mto: (28.1.2 sid) (1.1.14)
  • mto: This revision was merged to the branch mainline in revision 32.
  • Revision ID: james.westby@ubuntu.com-20110306160158-y94pzpmtd7b1xgjk
Tags: upstream-1.8
Import upstream version 1.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-bookmarks-pushpull.t
1
 
  $ echo "[extensions]" >> $HGRCPATH
2
 
  $ echo "bookmarks=" >> $HGRCPATH
3
 
 
4
 
  $ echo "[bookmarks]" >> $HGRCPATH
5
 
  $ echo "track.current = True" >> $HGRCPATH
6
 
 
7
1
initialize
8
2
 
9
3
  $ hg init a
48
42
  no changes found
49
43
  importing bookmark X
50
44
  $ hg bookmark
 
45
     X                         0:4e3505fd9583
51
46
     Y                         0:4e3505fd9583
52
 
     X                         0:4e3505fd9583
53
47
 
54
48
export bookmark by name
55
49
 
62
56
  no changes found
63
57
  exporting bookmark W
64
58
  $ hg -R ../a bookmarks
 
59
     W                         -1:000000000000
 
60
     X                         0:4e3505fd9583
65
61
     Y                         0:4e3505fd9583
66
 
     X                         0:4e3505fd9583
67
62
   * Z                         0:4e3505fd9583
68
 
     W                         -1:000000000000
69
63
 
70
64
delete a remote bookmark
71
65
 
72
66
  $ hg book -d W
73
67
  $ hg push -B W ../a
 
68
  pushing to ../a
 
69
  searching for changes
 
70
  no changes found
74
71
  deleting remote bookmark W
75
72
 
76
73
push/pull name that doesn't exist
77
74
 
78
75
  $ hg push -B badname ../a
 
76
  pushing to ../a
 
77
  searching for changes
 
78
  no changes found
79
79
  bookmark badname does not exist on the local or remote repository!
80
80
  [2]
81
81
  $ hg pull -B anotherbadname ../a
 
82
  pulling from ../a
82
83
  abort: remote bookmark anotherbadname not found!
83
84
  [255]
84
85
 
90
91
  adding f1
91
92
  $ hg book -f X
92
93
  $ hg book
 
94
   * X                         1:0d2164f0ce0d
93
95
     Y                         0:4e3505fd9583
94
 
   * X                         1:0d2164f0ce0d
95
96
     Z                         1:0d2164f0ce0d
96
97
 
97
98
  $ cd ../b
102
103
  adding f2
103
104
  $ hg book -f X
104
105
  $ hg book
 
106
   * X                         1:9b140be10808
105
107
     Y                         0:4e3505fd9583
106
 
   * X                         1:9b140be10808
107
108
     foo                       -1:000000000000
108
109
     foobar                    -1:000000000000
109
110
 
117
118
  not updating divergent bookmark X
118
119
  (run 'hg heads' to see heads, 'hg merge' to merge)
119
120
  $ hg book
 
121
   * X                         1:9b140be10808
120
122
     Y                         0:4e3505fd9583
121
 
   * X                         1:9b140be10808
122
123
     foo                       -1:000000000000
123
124
     foobar                    -1:000000000000
124
125
  $ hg push -f ../a
129
130
  adding file changes
130
131
  added 1 changesets with 1 changes to 1 files (+1 heads)
131
132
  $ hg -R ../a book
 
133
   * X                         1:0d2164f0ce0d
132
134
     Y                         0:4e3505fd9583
133
 
   * X                         1:0d2164f0ce0d
134
135
     Z                         1:0d2164f0ce0d
135
136
 
136
137
hgweb