From 3e7340209d0cf04bc6762ac6f83ef040c0989f03 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 7 Dec 2011 00:19:02 +0100 Subject: [PATCH] added help for bisect Signed-off-by: Sven Strickroth --- doc/images/en/ContextMenuBisect.png | Bin 0 -> 3062 bytes doc/images/en/bisect.png | Bin 0 -> 5491 bytes doc/source/en/TortoiseGit/tsvn_dug/dug.xml | 1 + doc/source/en/TortoiseGit/tsvn_dug/dug_bisect.xml | 62 ++++++++++++++++++++++ src/Resources/TortoiseProcENG.rc | 2 +- 5 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 doc/images/en/ContextMenuBisect.png create mode 100644 doc/images/en/bisect.png create mode 100644 doc/source/en/TortoiseGit/tsvn_dug/dug_bisect.xml diff --git a/doc/images/en/ContextMenuBisect.png b/doc/images/en/ContextMenuBisect.png new file mode 100644 index 0000000000000000000000000000000000000000..0d841df4e1f12263690beae0abcacf55d1c0ed5d GIT binary patch literal 3062 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 Z@?SRd-Kc + diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_bisect.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_bisect.xml new file mode 100644 index 000000000..4679ae903 --- /dev/null +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_bisect.xml @@ -0,0 +1,62 @@ + + + + + Bisect + + Bisect + + + if you want to find out which revision introduced a bug, you can use the bisect functionality. + Right click on a folder to pop up the context menu and then select + the command + + TortoiseGit + Bisect start + . + A dialog will pop up: +
+ Bisect start + +
+ Enter the last known good revision and the first or one known bad (this is normally HEAD). +
+ + After hitting OK, GIT will perform a binary search for the first faulty revision: Git + switches to a revision in the middle. Now you can test this revision. + + + TortoiseGit now provides three new options in the context menu: +
+ Bisect options + +
+ If this revision is OK, hit + + TortoiseGit + Bisect good + + , otherwise hit + + TortoiseGit + Bisect bad. + + Git will proceed with the binary search and switches to the "next" revision, so that you can test it. + This goes on until the faulty revision is found or you abort this operation by clicking on + + TortoiseGit + Bisect reset + + (this will reset the bisect process and switch out your previous branch/HEAD). +
+ + Selecting revisions + + If a revision cannot be tested, or you want to go on with a different one, you can easily go to the log and + (hard) reset the current HEAD to a revision you like. + + + + You can find more information at + +
diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 3e2741904..af80d0c3d 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1585,7 +1585,7 @@ BEGIN PUSHBUTTON "...",IDC_BUTTON_BAD,287,25,18,14 DEFPUSHBUTTON "OK",IDOK,141,44,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,197,44,50,14 - PUSHBUTTON "Help",IDHELP,255,44,50,14,WS_DISABLED + PUSHBUTTON "Help",IDHELP,255,44,50,14 END IDD_STASH DIALOGEX 0, 0, 267, 97 -- 2.11.4.GIT