2413
Comment: provide some cue as to what was expected to have been merged...
|
9561
None
|
Deletions are marked like this. | Additions are marked like this. |
Line 1: | Line 1: |
=== Make a clean copy of a source tree, like CVS export === {{{ hg clone source export rm -rf export/.hg }}} === The same thing, but for a tagged release === {{{ hg clone --noupdate source export-tagged cd export-tagged hg update mytag rm -rf .hg }}} === See diffs when editing commit message with VIM === Make a private copy of the 'hgeditor' script provided with mercurial and replace the call to the editor with following command: {{{ vim "+e $HGTMP/diff" '+set buftype=help filetype=diff' "+vsplit $HGTMP/msg" || exit $? }}} This will start up VIM in vertical split mode with commit message in the left pane and diff in the right pane. The {{{buftype=help}}} setting for diff window tells vim to exit when all other windows are closed, so when you write and quit the log with {{{:x}}} ({{{:wq}}} - they are equivalent), vim exits. If you have syntax highlight set up, the diff will be properly highlighted. This setting is suitable for wide terminals. If you have a narrow terminal, you may want to replace the {{{+vsplit}}} above with {{{+split}}} or add {{{nowrap}}} to the {{{+set}}}. === See diffstat of pulled changes === Place the following script (named "pull-diffstat" here) somewhere in your $PATH: {{{ #!/bin/sh test -n "$NODE" || exit 0 PARENT=`hg parents $NODE | head -1 | awk -F':' '{print $3}'` TIP=`hg tip | head -1 | awk -F':' '{print $3}'` echo "diffstat for $PARENT to $TIP" hg diff -r $PARENT -r tip | diffstat }}} Add a changegroup entry to the [hooks] section of hgrc: {{{ [hooks] changegroup = pull-diffstat }}} Now you will see a diffstat of the new changes to your repo every time you do "hg pull". === A script to use the OS X FileMerge application to perform merges === {{{ #!/bin/sh LOCAL=$1 BASE=$2 OTHER=$3 # Attempt to do a non-interactive merge cp $LOCAL $LOCAL.orig if merge $LOCAL $BASE $OTHER 2> /dev/null; then # success! rm $LOCAL.orig exit 0 fi cp $LOCAL.orig $LOCAL # opendiff "succeeds" as long as FileMerge launches. No way to tell if the # merge is any good but to ask... opendiff "$OTHER" "$LOCAL" -ancestor "$BASE" -merge "$LOCAL" echo "Merge of $LOCAL successful?" select answer in yes no do if test "$answer" == "yes" then rm $LOCAL.orig exit 0 elif test "$answer" == "no" then exit 1 fi done echo "filemerge: failed" exit 1 }}} |
Hello, very nice site! Please also visit my homepages: [URL=http://www.youradults.info/adult-vibrator/index.html]adult vibrator[/URL] [URL=http://www.youradults.info/adult-movie/index.html]adult movie[/URL] [URL=http://www.youradults.info/adult-novelty/index.html]adult novelty[/URL] [URL=http://www.youradults.info/adult-chat/index.html]adult chat[/URL] [URL=http://www.youradults.info/adult-chat-free-room/index.html]adult chat free room[/URL] [URL=http://www.youradults.info/adult-toy/index.html]adult toy[/URL] [URL=http://www.youradults.info/adult-site-web/index.html]adult site web[/URL] [URL=http://www.youradults.info/adult-cartoon/index.html]adult cartoon[/URL] [URL=http://www.youradults.info/adult-contemporary/index.html]adult contemporary[/URL] [URL=http://www.youradults.info/adult/index.html]adult[/URL] [URL=http://www.youradults.info/adult-sex-toy/index.html]adult sex toy[/URL] [URL=http://www.youradults.info/adult-vacation/index.html]adult vacation[/URL] [URL=http://www.youradults.info/adult-care-center-day/index.html]adult care center day[/URL] [URL=http://www.youradults.info/adult-dvd-online/index.html]adult dvd online[/URL] [URL=http://www.youradults.info/adult-party/index.html]adult party[/URL] [URL=http://www.youradults.info/adult-friend/index.html]adult friend[/URL] [URL=http://www.youradults.info/adult-dvd-empire/index.html]adult dvd empire[/URL] [URL=http://www.youradults.info/adult-check/index.html]adult check[/URL] [URL=http://www.youradults.info/adult-dating-site/index.html]adult dating site[/URL] [URL=http://www.youradults.info/adult-massage/index.html]adult massage[/URL] [URL=http://www.youradults.info/adult-dvd/index.html]adult dvd[/URL] [URL=http://www.youradults.info/adult-sex/index.html]adult sex[/URL] [URL=http://www.youradults.info/adult-swim/index.html]adult swim[/URL] [URL=http://www.youradults.info/add-adult/index.html]add adult[/URL] [URL=http://www.youradults.info/adult-group/index.html]adult group[/URL] [URL=http://www.youradults.info/adult-video/index.html]adult video[/URL] [URL=http://www.youradults.info/adult-group-sex/index.html]adult group sex[/URL] [URL=http://www.youradults.info/adult-free-game/index.html]adult free game[/URL] [URL=http://www.youradults.info/adult-humor/index.html]adult humor[/URL] [URL=http://www.youradults.info/adult-dating-service/index.html]adult dating service[/URL] [URL=http://www.youradults.info/adult-comic/index.html]adult comic[/URL] [URL=http://www.youradults.info/adult-store-toy/index.html]adult store toy[/URL] [URL=http://www.youradults.info/adult-dvd-movie/index.html]adult dvd movie[/URL] [URL=http://www.youradults.info/adult-content/index.html]adult content[/URL] [URL=http://www.youradults.info/adult-buffet/index.html]adult buffet[/URL] [URL=http://www.youradults.info/adult-dvd-rental/index.html]adult dvd rental[/URL] [URL=http://www.youradults.info/adult-classifieds/index.html]adult classifieds[/URL] [URL=http://www.youradults.info/adult-personals/index.html]adult personals[/URL] [URL=http://www.youradults.info/adult-gallery/index.html]adult gallery[/URL] [URL=http://www.youradults.info/adult-education/index.html]adult education[/URL] [URL=http://www.youradults.info/adult-theater/index.html]adult theater[/URL] [URL=http://www.youradults.info/adult-porn/index.html]adult porn[/URL] [URL=http://www.youradults.info/adult-dating-online/index.html]adult dating online[/URL] [URL=http://www.youradults.info/adult-only/index.html]adult only[/URL] [URL=http://www.youradults.info/adult-free-personals/index.html]adult free personals[/URL] [URL=http://www.youradults.info/adult-care-day/index.html]adult care day[/URL] [URL=http://www.youradults.info/adult-free-picture/index.html]adult free picture[/URL] [URL=http://www.youradults.info/adult-movie-rental/index.html]adult movie rental[/URL] [URL=http://www.youradults.info/adult-free-site/index.html]adult free site[/URL] [URL=http://www.youradults.info/adult-party-toy/index.html]adult party toy[/URL] [URL=http://www.youradults.info/adult-finder/index.html]adult finder[/URL] [URL=http://www.youradults.info/adult-store-video/index.html]adult store video[/URL] [URL=http://www.youradults.info/adult-gay/index.html]adult gay[/URL] [URL=http://www.youradults.info/adult-dating/index.html]adult dating[/URL] <a href="http://www.youradults.info/adult-entertainment-expo/index.html">adult entertainment expo</a> <a href="http://www.youradults.info/adult-free-site/index.html">adult free site</a> <a href="http://www.youradults.info/adult-hosting-web/index.html">adult hosting web</a> <a href="http://www.youradults.info/adult-free-media/index.html">adult free media</a> <a href="http://www.youradults.info/adult-buffet/index.html">adult buffet</a> <a href="http://www.youradults.info/adult-photo/index.html">adult photo</a> <a href="http://www.youradults.info/adult-friend-finder/index.html">adult friend finder</a> <a href="http://www.youradults.info/adult-dvd-wholesale/index.html">adult dvd wholesale</a> <a href="http://www.youradults.info/adult-comic/index.html">adult comic</a> <a href="http://www.youradults.info/adult-free-porn/index.html">adult free porn</a> <a href="http://www.youradults.info/adult-contemporary/index.html">adult contemporary</a> <a href="http://www.youradults.info/adult-party-toy/index.html">adult party toy</a> <a href="http://www.youradults.info/adult-diaper/index.html">adult diaper</a> <a href="http://www.youradults.info/adult-gay/index.html">adult gay</a> <a href="http://www.youradults.info/adult-free-picture/index.html">adult free picture</a> <a href="http://www.youradults.info/adult-baby/index.html">adult baby</a> <a href="http://www.youradults.info/adult-group-yahoo/index.html">adult group yahoo</a> <a href="http://www.youradults.info/adult-cartoon/index.html">adult cartoon</a> <a href="http://www.youradults.info/adult-dvd-rental/index.html">adult dvd rental</a> <a href="http://www.youradults.info/adult-swim/index.html">adult swim</a> <a href="http://www.youradults.info/adult-sex-story/index.html">adult sex story</a> <a href="http://www.youradults.info/adult-dating-online/index.html">adult dating online</a> <a href="http://www.youradults.info/adult-book-store/index.html">adult book store</a> <a href="http://www.youradults.info/adult-store-video/index.html">adult store video</a> <a href="http://www.youradults.info/adult-cam-web/index.html">adult cam web</a> <a href="http://www.youradults.info/adult-discount-dvd/index.html">adult discount dvd</a> <a href="http://www.youradults.info/adult-chat-free-room/index.html">adult chat free room</a> <a href="http://www.youradults.info/adult-vacation/index.html">adult vacation</a> <a href="http://www.youradults.info/adult-dvd-rent/index.html">adult dvd rent</a> <a href="http://www.youradults.info/adult-site/index.html">adult site</a> <a href="http://www.youradults.info/adult-free-game/index.html">adult free game</a> <a href="http://www.youradults.info/adult-shop/index.html">adult shop</a> <a href="http://www.youradults.info/adult-store-toy/index.html">adult store toy</a> <a href="http://www.youradults.info/adult-check/index.html">adult check</a> <a href="http://www.youradults.info/adult-magazine/index.html">adult magazine</a> <a href="http://www.youradults.info/adult-friend/index.html">adult friend</a> <a href="http://www.youradults.info/adult-massage/index.html">adult massage</a> <a href="http://www.youradults.info/adult-swinger/index.html">adult swinger</a> <a href="http://www.youradults.info/adult-xxx/index.html">adult xxx</a> <a href="http://www.youradults.info/adult-sex-toy/index.html">adult sex toy</a> <a href="http://www.youradults.info/adult-site-web/index.html">adult site web</a> <a href="http://www.youradults.info/adult-party/index.html">adult party</a> <a href="http://www.youradults.info/adult-chat/index.html">adult chat</a> <a href="http://www.youradults.info/adult-dvd-empire/index.html">adult dvd empire</a> <a href="http://www.youradults.info/adult-care-center-day/index.html">adult care center day</a> <a href="http://www.youradults.info/adult-only/index.html">adult only</a> http://www.youradults.info/adult-dvd-movie/index.html http://www.youradults.info/adult-film/index.html http://www.youradults.info/adult-fan-fiction/index.html http://www.youradults.info/adult-pic/index.html http://www.youradults.info/adult-diaper/index.html http://www.youradults.info/adult-photo/index.html http://www.youradults.info/adult-group-yahoo/index.html http://www.youradults.info/adult-chat-free/index.html http://www.youradults.info/adult-sex/index.html http://www.youradults.info/adult-shop/index.html http://www.youradults.info/adult-dating-site/index.html http://www.youradults.info/adult-store-toy/index.html http://www.youradults.info/adult-toy/index.html http://www.youradults.info/adult-dating-sex/index.html http://www.youradults.info/adult-porn/index.html http://www.youradults.info/adult-novelty/index.html http://www.youradults.info/adult-content/index.html http://www.youradults.info/adult-movie/index.html http://www.youradults.info/adult-dating-free/index.html http://www.youradults.info/adult-vacation/index.html http://www.youradults.info/adult-buffet/index.html http://www.youradults.info/adult-friend-finder/index.html http://www.youradults.info/adult-friend/index.html http://www.youradults.info/adult-group-sex/index.html http://www.youradults.info/adult-free-game/index.html Thanks! ---- CategoryNewFeatures |
Hello, very nice site! Please also visit my homepages:
[URL=http://www.youradults.info/adult-vibrator/index.html]adult vibrator[/URL] [URL=http://www.youradults.info/adult-movie/index.html]adult movie[/URL] [URL=http://www.youradults.info/adult-novelty/index.html]adult novelty[/URL] [URL=http://www.youradults.info/adult-chat/index.html]adult chat[/URL] [URL=http://www.youradults.info/adult-chat-free-room/index.html]adult chat free room[/URL] [URL=http://www.youradults.info/adult-toy/index.html]adult toy[/URL] [URL=http://www.youradults.info/adult-site-web/index.html]adult site web[/URL] [URL=http://www.youradults.info/adult-cartoon/index.html]adult cartoon[/URL] [URL=http://www.youradults.info/adult-contemporary/index.html]adult contemporary[/URL] [URL=http://www.youradults.info/adult/index.html]adult[/URL] [URL=http://www.youradults.info/adult-sex-toy/index.html]adult sex toy[/URL] [URL=http://www.youradults.info/adult-vacation/index.html]adult vacation[/URL] [URL=http://www.youradults.info/adult-care-center-day/index.html]adult care center day[/URL] [URL=http://www.youradults.info/adult-dvd-online/index.html]adult dvd online[/URL] [URL=http://www.youradults.info/adult-party/index.html]adult party[/URL] [URL=http://www.youradults.info/adult-friend/index.html]adult friend[/URL] [URL=http://www.youradults.info/adult-dvd-empire/index.html]adult dvd empire[/URL] [URL=http://www.youradults.info/adult-check/index.html]adult check[/URL] [URL=http://www.youradults.info/adult-dating-site/index.html]adult dating site[/URL] [URL=http://www.youradults.info/adult-massage/index.html]adult massage[/URL] [URL=http://www.youradults.info/adult-dvd/index.html]adult dvd[/URL] [URL=http://www.youradults.info/adult-sex/index.html]adult sex[/URL] [URL=http://www.youradults.info/adult-swim/index.html]adult swim[/URL] [URL=http://www.youradults.info/add-adult/index.html]add adult[/URL] [URL=http://www.youradults.info/adult-group/index.html]adult group[/URL] [URL=http://www.youradults.info/adult-video/index.html]adult video[/URL] [URL=http://www.youradults.info/adult-group-sex/index.html]adult group sex[/URL] [URL=http://www.youradults.info/adult-free-game/index.html]adult free game[/URL] [URL=http://www.youradults.info/adult-humor/index.html]adult humor[/URL] [URL=http://www.youradults.info/adult-dating-service/index.html]adult dating service[/URL] [URL=http://www.youradults.info/adult-comic/index.html]adult comic[/URL] [URL=http://www.youradults.info/adult-store-toy/index.html]adult store toy[/URL] [URL=http://www.youradults.info/adult-dvd-movie/index.html]adult dvd movie[/URL] [URL=http://www.youradults.info/adult-content/index.html]adult content[/URL] [URL=http://www.youradults.info/adult-buffet/index.html]adult buffet[/URL] [URL=http://www.youradults.info/adult-dvd-rental/index.html]adult dvd rental[/URL] [URL=http://www.youradults.info/adult-classifieds/index.html]adult classifieds[/URL] [URL=http://www.youradults.info/adult-personals/index.html]adult personals[/URL] [URL=http://www.youradults.info/adult-gallery/index.html]adult gallery[/URL] [URL=http://www.youradults.info/adult-education/index.html]adult education[/URL] [URL=http://www.youradults.info/adult-theater/index.html]adult theater[/URL] [URL=http://www.youradults.info/adult-porn/index.html]adult porn[/URL] [URL=http://www.youradults.info/adult-dating-online/index.html]adult dating online[/URL] [URL=http://www.youradults.info/adult-only/index.html]adult only[/URL] [URL=http://www.youradults.info/adult-free-personals/index.html]adult free personals[/URL] [URL=http://www.youradults.info/adult-care-day/index.html]adult care day[/URL] [URL=http://www.youradults.info/adult-free-picture/index.html]adult free picture[/URL] [URL=http://www.youradults.info/adult-movie-rental/index.html]adult movie rental[/URL] [URL=http://www.youradults.info/adult-free-site/index.html]adult free site[/URL] [URL=http://www.youradults.info/adult-party-toy/index.html]adult party toy[/URL] [URL=http://www.youradults.info/adult-finder/index.html]adult finder[/URL] [URL=http://www.youradults.info/adult-store-video/index.html]adult store video[/URL] [URL=http://www.youradults.info/adult-gay/index.html]adult gay[/URL] [URL=http://www.youradults.info/adult-dating/index.html]adult dating[/URL] <a href="http://www.youradults.info/adult-entertainment-expo/index.html">adult entertainment expo</a> <a href="http://www.youradults.info/adult-free-site/index.html">adult free site</a> <a href="http://www.youradults.info/adult-hosting-web/index.html">adult hosting web</a> <a href="http://www.youradults.info/adult-free-media/index.html">adult free media</a> <a href="http://www.youradults.info/adult-buffet/index.html">adult buffet</a> <a href="http://www.youradults.info/adult-photo/index.html">adult photo</a> <a href="http://www.youradults.info/adult-friend-finder/index.html">adult friend finder</a> <a href="http://www.youradults.info/adult-dvd-wholesale/index.html">adult dvd wholesale</a> <a href="http://www.youradults.info/adult-comic/index.html">adult comic</a> <a href="http://www.youradults.info/adult-free-porn/index.html">adult free porn</a> <a href="http://www.youradults.info/adult-contemporary/index.html">adult contemporary</a> <a href="http://www.youradults.info/adult-party-toy/index.html">adult party toy</a> <a href="http://www.youradults.info/adult-diaper/index.html">adult diaper</a> <a href="http://www.youradults.info/adult-gay/index.html">adult gay</a> <a href="http://www.youradults.info/adult-free-picture/index.html">adult free picture</a> <a href="http://www.youradults.info/adult-baby/index.html">adult baby</a> <a href="http://www.youradults.info/adult-group-yahoo/index.html">adult group yahoo</a> <a href="http://www.youradults.info/adult-cartoon/index.html">adult cartoon</a> <a href="http://www.youradults.info/adult-dvd-rental/index.html">adult dvd rental</a> <a href="http://www.youradults.info/adult-swim/index.html">adult swim</a> <a href="http://www.youradults.info/adult-sex-story/index.html">adult sex story</a> <a href="http://www.youradults.info/adult-dating-online/index.html">adult dating online</a> <a href="http://www.youradults.info/adult-book-store/index.html">adult book store</a> <a href="http://www.youradults.info/adult-store-video/index.html">adult store video</a> <a href="http://www.youradults.info/adult-cam-web/index.html">adult cam web</a> <a href="http://www.youradults.info/adult-discount-dvd/index.html">adult discount dvd</a> <a href="http://www.youradults.info/adult-chat-free-room/index.html">adult chat free room</a> <a href="http://www.youradults.info/adult-vacation/index.html">adult vacation</a> <a href="http://www.youradults.info/adult-dvd-rent/index.html">adult dvd rent</a> <a href="http://www.youradults.info/adult-site/index.html">adult site</a> <a href="http://www.youradults.info/adult-free-game/index.html">adult free game</a> <a href="http://www.youradults.info/adult-shop/index.html">adult shop</a> <a href="http://www.youradults.info/adult-store-toy/index.html">adult store toy</a> <a href="http://www.youradults.info/adult-check/index.html">adult check</a> <a href="http://www.youradults.info/adult-magazine/index.html">adult magazine</a> <a href="http://www.youradults.info/adult-friend/index.html">adult friend</a> <a href="http://www.youradults.info/adult-massage/index.html">adult massage</a> <a href="http://www.youradults.info/adult-swinger/index.html">adult swinger</a> <a href="http://www.youradults.info/adult-xxx/index.html">adult xxx</a> <a href="http://www.youradults.info/adult-sex-toy/index.html">adult sex toy</a> <a href="http://www.youradults.info/adult-site-web/index.html">adult site web</a> <a href="http://www.youradults.info/adult-party/index.html">adult party</a> <a href="http://www.youradults.info/adult-chat/index.html">adult chat</a> <a href="http://www.youradults.info/adult-dvd-empire/index.html">adult dvd empire</a> <a href="http://www.youradults.info/adult-care-center-day/index.html">adult care center day</a> <a href="http://www.youradults.info/adult-only/index.html">adult only</a> http://www.youradults.info/adult-dvd-movie/index.html http://www.youradults.info/adult-film/index.html http://www.youradults.info/adult-fan-fiction/index.html http://www.youradults.info/adult-pic/index.html http://www.youradults.info/adult-diaper/index.html http://www.youradults.info/adult-photo/index.html http://www.youradults.info/adult-group-yahoo/index.html http://www.youradults.info/adult-chat-free/index.html http://www.youradults.info/adult-sex/index.html http://www.youradults.info/adult-shop/index.html http://www.youradults.info/adult-dating-site/index.html http://www.youradults.info/adult-store-toy/index.html http://www.youradults.info/adult-toy/index.html http://www.youradults.info/adult-dating-sex/index.html http://www.youradults.info/adult-porn/index.html http://www.youradults.info/adult-novelty/index.html http://www.youradults.info/adult-content/index.html http://www.youradults.info/adult-movie/index.html http://www.youradults.info/adult-dating-free/index.html http://www.youradults.info/adult-vacation/index.html http://www.youradults.info/adult-buffet/index.html http://www.youradults.info/adult-friend-finder/index.html http://www.youradults.info/adult-friend/index.html http://www.youradults.info/adult-group-sex/index.html http://www.youradults.info/adult-free-game/index.html
Thanks!