Chromium Code Reviews
Help | Chromium Project | Sign in
(285)

Issue 22814005: When reverting, just reverse merge the entire revision. (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
8 months ago by jochen (OOO until Apr 22)
Modified:
8 months ago
CC:
chromium-reviews_chromium.org, Dirk Pranke, cmp-cc_chromium.org, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org
Visibility:
Public.

Description

When reverting, just reverse merge the entire revision.

Since we already checked out all files that were touched in the revision
to revert, it should just work[tm].

BUG=64643
R=agable@chromium.org, maruel@chromium.org, phajdan.jr@chromium.org
TEST=tested manually that svn merge -r (without -N) reverts directory deletes

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=219094

Patch Set 1 #

Total comments: 1

Patch Set 2 : updates #

Total comments: 1

Patch Set 3 : updates #

Unified diffs Side-by-side diffs Delta from patch set Stats (+3 lines, -6 lines) Lint Patch
M drover.py View 1 2 1 chunk +3 lines, -6 lines 0 comments ? errors Download
Trybot results:
Commit:

Messages

Total messages: 11
jochen (OOO until Apr 22)
8 months ago #1
agable
This pretty much lgtm. Using SVN's built-in capabilities is better than hardcoding something complex, so ...
8 months ago #2
Paweł Hajdan Jr.
https://codereview.chromium.org/22814005/diff/6001/drover.py File drover.py (right): https://codereview.chromium.org/22814005/diff/6001/drover.py#newcode278 drover.py:278: command = ('svn merge -c -%d %s .' % ...
8 months ago #3
M-A Ruel
IIRC, Anthony came up with this logic. There were issues like performance that I don't ...
8 months ago #4
jochen (OOO until Apr 22)
On 2013/08/22 18:13:40, Paweł Hajdan Jr. wrote: > https://codereview.chromium.org/22814005/diff/6001/drover.py > File drover.py (right): > > ...
8 months ago #5
M-A Ruel
On 2013/08/22 18:21:01, jochen wrote: > On 2013/08/22 18:13:40, Paweł Hajdan Jr. wrote: > > ...
8 months ago #6
laforge
On 2013/08/22 18:21:01, jochen wrote: > On 2013/08/22 18:13:40, Paweł Hajdan Jr. wrote: > > ...
8 months ago #7
jochen (OOO until Apr 22)
added --ignore-ancestry
8 months ago #8
Paweł Hajdan Jr.
LGTM, thanks!
8 months ago #9
jochen (OOO until Apr 22)
I tried reverting r218441 with and without my patch. Without my patch, it took 2 ...
8 months ago #10
jochen (OOO until Apr 22)
8 months ago #11
Message was sent while issue was closed.
Committed patchset #3 manually as r219094 (presubmit successful).
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1280:2d3e6564b7b6