[tor-commits] [tor-messenger-build/master] Update the rebasing document

sukhbir at torproject.org sukhbir at torproject.org
Mon Jul 31 14:49:38 UTC 2017


commit 2ad07344232d6af5878cb2da992cb78251988fee
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Jul 26 11:02:55 2017 -0400

    Update the rebasing document
---
 docs/rebasing.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/docs/rebasing.md b/docs/rebasing.md
index 98101f2..4ee9e4b 100644
--- a/docs/rebasing.md
+++ b/docs/rebasing.md
@@ -20,16 +20,13 @@ This isn't strictly necessary but the author of this document prefers working
 in git.  You'll need to install [fast-export](https://github.com/frej/fast-export)
 
 ```
-hg clone https://hg.mozilla.org/releases/comm-esr45/
+hg clone https://hg.mozilla.org/releases/comm-esr52/
 mkdir tor-messenger
 cd tor-messenger
 git init
-hg-fast-export -r ../comm-esr45
+hg-fast-export -r ../comm-esr52 --force
 ```
 
-Note, this is going to complain about detached heads in mercurial.
-Just `--force` it.
-
 Now you have a git repo sync'd w/ hg
 
 You can rerun that as new commits come in (`hg pull && hg update`),
@@ -43,7 +40,7 @@ from the time this document was originally written.  Obviously, update it as
 necessary.
 
 ```
-export TAG=THUNDERBIRD_45_8_0_RELEASE
+export TAG=THUNDERBIRD_52_2_1_RELEASE
 
 # We're still in "tor-messenger" from above
 git checkout -b tm-base $TAG





More information about the tor-commits mailing list