docs/merging_and_patching.md - Issue 1420833004: [Docs] Make it more clear that a issue on the issue tracker is needed

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: docs/merging_and_patching.md

Issue 1420833004: [Docs] Make it more clear that a issue on the issue tracker is needed (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 # Introduction	1 # Introduction

2	2

3 If you have a patch to the master branch (e.g. an important bug fix) that needs to be merged into one of the production V8 branches, read on.	3 If you have a patch to the master branch (e.g. an important bug fix) that needs to be merged into one of the production V8 branches, read on.

4	4

5 For the examples, a branched 2.4 version of V8 will be used. Substitute "2.4" wi th your version number.	5 For the examples, a branched 2.4 version of V8 will be used. Substitute "2.4" wi th your version number.

6	6

7 An associated issue is mandatory if a patch is merged. This helps with keeping track of merges.	7 **An associated issue on Chromium's or V8's issue tracker is mandatory if a patc h is merged. This helps with keeping track of merges.

	8 You can use [a template](https://code.google.com/p/v8/issues/entry?template=Merg e%20request) to create an issue.**

8	9

9 # Merge process outlined	10 # Merge process outlined

10	11

11 The merge process in the Chromium and V8 tracker is driven by labels in the form of	12 The merge process in the Chromium and V8 tracker is driven by labels in the form of

12 ```	13 ```

13 Merge-[Status]-[Branch]	14 Merge-[Status]-[Branch]

14 ```	15 ```

15 The currently important labels for V8 are:	16 The currently important labels for V8 are:

16	17

17 1. Merge-Request-## initiates the process => This fix should be merged into M- ##	18 1. Merge-Request-## initiates the process => This fix should be merged into M- ##

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 _Body:_ We have merged a fix to the V8 version 2.4 branch (the version used in C hrome 8)	54 _Body:_ We have merged a fix to the V8 version 2.4 branch (the version used in C hrome 8)

54	55

55 Version 2.4.9.10: Issue xxx: The parser doesn't parse.	56 Version 2.4.9.10: Issue xxx: The parser doesn't parse.

56 ```	57 ```

57	58

58 # FAQ	59 # FAQ

59	60

60 ## I get an error during merge that is related to tagging. What should I do?	61 ## I get an error during merge that is related to tagging. What should I do?

61 When two people are merging at the same time a race-condition can happen in the merge scripts. If this is the case, contact machenbach@chromium.org and hablich@ chromium.org.	62 When two people are merging at the same time a race-condition can happen in the merge scripts. If this is the case, contact machenbach@chromium.org and hablich@ chromium.org.

62 ## Is there a TL;DR;?	63 ## Is there a TL;DR;?

63 1. Create issue	64 1. [Create issue on issue tracker](https://code.google.com/p/v8/issues/entry?t emplate=Merge%20request)

64 1. Add Merge-Request-{Branch} to the issue	65 1. Add Merge-Request-{Branch} to the issue

65 1. Wait until somebody will add Merge-Approved-{Branch}	66 1. Wait until somebody will add Merge-Approved-{Branch}

66 1. Merge	67 1. Merge

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »