Mercurial > hg > Database > jungle-sharp
annotate src/main/csharp/jp.ac.u-ryukyu.ie.cr/jungle-main/persistent/msgpack/.git/hooks/pre-rebase.sample @ 10:abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
author | Kazuma Takeda <kazuma-arashi@hotmail.co.jp> |
---|---|
date | Sun, 23 Oct 2016 07:40:50 +0900 |
parents | |
children |
rev | line source |
---|---|
10
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
1 #!/bin/sh |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
2 # |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
3 # Copyright (c) 2006, 2008 Junio C Hamano |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
4 # |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
5 # The "pre-rebase" hook is run just before "git rebase" starts doing |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
6 # its job, and can prevent the command from running by exiting with |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
7 # non-zero status. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
8 # |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
9 # The hook is called with the following parameters: |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
10 # |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
11 # $1 -- the upstream the series was forked from. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
12 # $2 -- the branch being rebased (or empty when rebasing the current branch). |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
13 # |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
14 # This sample shows how to prevent topic branches that are already |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
15 # merged to 'next' branch from getting rebased, because allowing it |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
16 # would result in rebasing already published history. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
17 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
18 publish=next |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
19 basebranch="$1" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
20 if test "$#" = 2 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
21 then |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
22 topic="refs/heads/$2" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
23 else |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
24 topic=`git symbolic-ref HEAD` || |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
25 exit 0 ;# we do not interrupt rebasing detached HEAD |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
26 fi |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
27 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
28 case "$topic" in |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
29 refs/heads/??/*) |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
30 ;; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
31 *) |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
32 exit 0 ;# we do not interrupt others. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
33 ;; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
34 esac |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
35 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
36 # Now we are dealing with a topic branch being rebased |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
37 # on top of master. Is it OK to rebase it? |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
38 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
39 # Does the topic really exist? |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
40 git show-ref -q "$topic" || { |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
41 echo >&2 "No such branch $topic" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
42 exit 1 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
43 } |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
44 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
45 # Is topic fully merged to master? |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
46 not_in_master=`git rev-list --pretty=oneline ^master "$topic"` |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
47 if test -z "$not_in_master" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
48 then |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
49 echo >&2 "$topic is fully merged to master; better remove it." |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
50 exit 1 ;# we could allow it, but there is no point. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
51 fi |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
52 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
53 # Is topic ever merged to next? If so you should not be rebasing it. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
54 only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
55 only_next_2=`git rev-list ^master ${publish} | sort` |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
56 if test "$only_next_1" = "$only_next_2" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
57 then |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
58 not_in_topic=`git rev-list "^$topic" master` |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
59 if test -z "$not_in_topic" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
60 then |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
61 echo >&2 "$topic is already up-to-date with master" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
62 exit 1 ;# we could allow it, but there is no point. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
63 else |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
64 exit 0 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
65 fi |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
66 else |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
67 not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
68 /usr/bin/perl -e ' |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
69 my $topic = $ARGV[0]; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
70 my $msg = "* $topic has commits already merged to public branch:\n"; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
71 my (%not_in_next) = map { |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
72 /^([0-9a-f]+) /; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
73 ($1 => 1); |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
74 } split(/\n/, $ARGV[1]); |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
75 for my $elem (map { |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
76 /^([0-9a-f]+) (.*)$/; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
77 [$1 => $2]; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
78 } split(/\n/, $ARGV[2])) { |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
79 if (!exists $not_in_next{$elem->[0]}) { |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
80 if ($msg) { |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
81 print STDERR $msg; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
82 undef $msg; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
83 } |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
84 print STDERR " $elem->[1]\n"; |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
85 } |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
86 } |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
87 ' "$topic" "$not_in_next" "$not_in_master" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
88 exit 1 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
89 fi |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
90 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
91 exit 0 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
92 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
93 ################################################################ |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
94 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
95 This sample hook safeguards topic branches that have been |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
96 published from being rewound. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
97 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
98 The workflow assumed here is: |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
99 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
100 * Once a topic branch forks from "master", "master" is never |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
101 merged into it again (either directly or indirectly). |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
102 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
103 * Once a topic branch is fully cooked and merged into "master", |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
104 it is deleted. If you need to build on top of it to correct |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
105 earlier mistakes, a new topic branch is created by forking at |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
106 the tip of the "master". This is not strictly necessary, but |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
107 it makes it easier to keep your history simple. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
108 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
109 * Whenever you need to test or publish your changes to topic |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
110 branches, merge them into "next" branch. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
111 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
112 The script, being an example, hardcodes the publish branch name |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
113 to be "next", but it is trivial to make it configurable via |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
114 $GIT_DIR/config mechanism. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
115 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
116 With this workflow, you would want to know: |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
117 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
118 (1) ... if a topic branch has ever been merged to "next". Young |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
119 topic branches can have stupid mistakes you would rather |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
120 clean up before publishing, and things that have not been |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
121 merged into other branches can be easily rebased without |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
122 affecting other people. But once it is published, you would |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
123 not want to rewind it. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
124 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
125 (2) ... if a topic branch has been fully merged to "master". |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
126 Then you can delete it. More importantly, you should not |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
127 build on top of it -- other people may already want to |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
128 change things related to the topic as patches against your |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
129 "master", so if you need further changes, it is better to |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
130 fork the topic (perhaps with the same name) afresh from the |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
131 tip of "master". |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
132 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
133 Let's look at this example: |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
134 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
135 o---o---o---o---o---o---o---o---o---o "next" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
136 / / / / |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
137 / a---a---b A / / |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
138 / / / / |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
139 / / c---c---c---c B / |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
140 / / / \ / |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
141 / / / b---b C \ / |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
142 / / / / \ / |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
143 ---o---o---o---o---o---o---o---o---o---o---o "master" |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
144 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
145 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
146 A, B and C are topic branches. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
147 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
148 * A has one fix since it was merged up to "next". |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
149 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
150 * B has finished. It has been fully merged up to "master" and "next", |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
151 and is ready to be deleted. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
152 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
153 * C has not merged to "next" at all. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
154 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
155 We would want to allow C to be rebased, refuse A, and encourage |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
156 B to be deleted. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
157 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
158 To compute (1): |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
159 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
160 git rev-list ^master ^topic next |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
161 git rev-list ^master next |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
162 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
163 if these match, topic has not merged in next at all. |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
164 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
165 To compute (2): |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
166 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
167 git rev-list master..topic |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
168 |
abe0c247f5a5
Add Network module. but, unComplete NetworkDefaultJungleTreeEditor.cs
Kazuma Takeda <kazuma-arashi@hotmail.co.jp>
parents:
diff
changeset
|
169 if this is empty, it is fully merged to "master". |