equal
deleted
inserted
replaced
129 |
129 |
130 Fix branch names. |
130 Fix branch names. |
131 ----------------- |
131 ----------------- |
132 :: |
132 :: |
133 |
133 |
134 $ hg conver --branchmap $branchmapfile oldrepo newrepo |
134 $ hg convert --branchmap $branchmapfile oldrepo newrepo |
135 |
135 |
136 To convert non-ASCII names use UTF-8 coding for 'branchmap' file. |
136 To convert non-ASCII names use UTF-8 coding for 'branchmap' file. |
137 |
137 |
138 When converted names with spaces only last space in 'branchmap' file treat as |
138 When converted names with spaces only last space in 'branchmap' file treat as |
139 separator between old branch name and new, so new branch name can not contain |
139 separator between old branch name and new, so new branch name can not contain |
140 spaces. |
140 spaces. |
141 |
141 |
142 Join history of two repos. |
142 Joining history of two repos. |
143 ========================== |
143 ============================= |
144 :: |
144 :: |
145 |
145 |
146 $ cat >filemap1.txt <<EOF |
146 $ cat >filemap1.txt <<EOF |
147 rename . dir1 |
147 rename . dir1 |
148 EOF |
148 EOF |
240 #!/bin/sh |
240 #!/bin/sh |
241 CMD=/usr/bin/hg |
241 CMD=/usr/bin/hg |
242 |
242 |
243 PORT=7878 |
243 PORT=7878 |
244 SRC=/srv/hg |
244 SRC=/srv/hg |
245 CONGIG=/srv/hg/hgweb.config |
245 CONFIG=/srv/hg/hgweb.config |
246 PIDFILE=/var/run/hg.pid |
246 PIDFILE=/var/run/hg.pid |
247 |
247 |
248 case "$1" in |
248 case "$1" in |
249 start) |
249 start) |
250 echo "Mecurial Server service starting." |
250 echo "Mercurial Server service starting." |
251 (cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE") |
251 (cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE") |
252 ;; |
252 ;; |
253 stop) |
253 stop) |
254 if [ -f "$PIDFILE" ]; then |
254 if [ -f "$PIDFILE" ]; then |
255 PID=`cat "$PIDFILE"` |
255 PID=`cat "$PIDFILE"` |
334 You can delete patch from patch list (before that you need de-apply patch):: |
334 You can delete patch from patch list (before that you need de-apply patch):: |
335 |
335 |
336 $ hg qpop -a |
336 $ hg qpop -a |
337 $ hg qdelete first.patch |
337 $ hg qdelete first.patch |
338 |
338 |
339 To add new version of source and fix patches for it first de apply patches, |
339 To add new version of source and fix patches for it first de-apply patches, |
340 then pull new changes and try apply patches on top of new sources:: |
340 then pull new changes and try apply patches on top of new sources:: |
341 |
341 |
342 $ hg qpop -a |
342 $ hg qpop -a |
343 $ rm * # .hg dir not deleted because its name start with dot |
343 $ rm * # .hg dir not deleted because its name start with dot |
344 $ cd .. |
344 $ cd .. |