-
Notifications
You must be signed in to change notification settings - Fork 15
/
README.pusher
85 lines (58 loc) · 2.17 KB
/
README.pusher
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
How to push
===========
Bokken is pushed to three places:
- https://inguma.eu/projects/bokken/repository
- https://github.com/inguma/bokken
- https://bitbucket.org/inguma/bokken/src
Currently there's no automation behind these three trees and the pusher is responsible to update them.
The best way of controlling this for now is:
- Install hg-git.
- Add to .hg/hgrc:
[paths]
default = ssh://nexo.inguma.eu//repos/bokken
git = git+ssh://git@github.com/inguma/bokken.git
bb = ssh://hg@bitbucket.org/inguma/bokken
- When you push a change, do in a row:
`$ hg push (for inguma.eu)`
`$ hg push git (for GitHub)`
`$ hg push bb (for BitBucket)`
- When you need to get a pull request from GitHub:
`$ hg pull git://github.com/ThisContributor/bokken.git`
then merge and push normally as above.
Problems
========
"No changes found" when pushing to git
--------------------------------------
If you have connectivity issues when pushing to git, you may end up with this
error:
user@machine:~/bokken$ hg push git
pushing to git+ssh://git@github.com/inguma/bokken.git
searching for changes
no changes found
This happens because the 'master' bookmark loses its sync with the Mercurial
tip. We'll reset it and the push will succeed.
user@machine:~/bokken$ hg bookmark -f master
user@machine:~/bokken$ hg push git
pushing to git+ssh://git@github.com/inguma/bokken.git
searching for changes
5 commits found
adding objects
[...]
Inconsistencies in the git import phase
---------------------------------------
You may find the following error if you e.g. previously rolled back
changes acquired by git:
$ hg pull git://github.com/ThisContributor/bokken.git
pulling from git://github.com/ThisContributor/bokken.git
no changes found
abort: unknown revision '0f27313fff9539905dbac04f078afad8f78b0dee'!
If this is the case, clean the git revision map with git-cleanup:
$ hg git-cleanup
git commit map cleaned
and then the normal procedure:
$ hg pull git://github.com/ThisContributor/bokken.git
pulling from git://github.com/ThisContributor/bokken.git
importing git objects into hg
lib/blah.py
lib/bleh.py
(run 'hg heads' to see heads, 'hg merge' to merge)