|
|
Chromium Code Reviews
DescriptionClean-up coding style
BUG=
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=263553
Patch Set 1 #Patch Set 2 : rebase patch #Patch Set 3 : upload other cleaup #
Messages
Total messages: 49 (0 generated)
Please review this. I`d like to help cleanup. It is just for start.
lgtm
On 2014/04/11 21:28:33, benwells wrote: > lgtm and welcome to the team ;)
On 2014/04/11 21:28:41, benwells wrote: > On 2014/04/11 21:28:33, benwells wrote: > > lgtm > > and welcome to the team ;) Thanks a lot :)
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for extensions/common/url_pattern_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file extensions/common/url_pattern_unittest.cc
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 69.
Hunk #3 FAILED at 380.
3 out of 3 hunks FAILED -- saving rejects to file
extensions/common/url_pattern_unittest.cc.rej
Patch: extensions/common/url_pattern_unittest.cc
Index: extensions/common/url_pattern_unittest.cc
diff --git a/extensions/common/url_pattern_unittest.cc
b/extensions/common/url_pattern_unittest.cc
index
d1cc8c2103cccf01561f9723471b1ffe580bc4e6..3e0c816ac35ec2d82a15a5814ed43241b3002d87
100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
- { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" },
+ { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" },
{ "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" },
@@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) {
// Port-like strings in the path should not trigger a warning.
{ "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" },
{ "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" },
- { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" },
+ { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
@@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) {
EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
EXPECT_FALSE(pattern.MatchesURL(
GURL("filesystem:http://www.example.com:8080/foo/")));
-
EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo")));
+ EXPECT_FALSE(pattern.MatchesURL(
+ GURL("filesystem:http://www.example.com/f/foo")));
}
// Explicit port wildcard
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for extensions/common/url_pattern_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file extensions/common/url_pattern_unittest.cc
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 69.
Hunk #3 FAILED at 380.
3 out of 3 hunks FAILED -- saving rejects to file
extensions/common/url_pattern_unittest.cc.rej
Patch: extensions/common/url_pattern_unittest.cc
Index: extensions/common/url_pattern_unittest.cc
diff --git a/extensions/common/url_pattern_unittest.cc
b/extensions/common/url_pattern_unittest.cc
index
d1cc8c2103cccf01561f9723471b1ffe580bc4e6..3e0c816ac35ec2d82a15a5814ed43241b3002d87
100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
- { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" },
+ { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" },
{ "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" },
@@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) {
// Port-like strings in the path should not trigger a warning.
{ "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" },
{ "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" },
- { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" },
+ { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
@@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) {
EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
EXPECT_FALSE(pattern.MatchesURL(
GURL("filesystem:http://www.example.com:8080/foo/")));
-
EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo")));
+ EXPECT_FALSE(pattern.MatchesURL(
+ GURL("filesystem:http://www.example.com/f/foo")));
}
// Explicit port wildcard
I got this messages form commit-bot Failed to apply patch for extensions/common/url_pattern_unittest.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file extensions/common/url_pattern_unittest.cc Hunk #1 FAILED at 55. Hunk #2 FAILED at 69. Hunk #3 FAILED at 380. 3 out of 3 hunks FAILED -- saving rejects to file extensions/common/url_pattern_unittest.cc.rej I dont know what it means.. Could you help me to solve this ?
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for extensions/common/url_pattern_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file extensions/common/url_pattern_unittest.cc
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 69.
Hunk #3 FAILED at 380.
3 out of 3 hunks FAILED -- saving rejects to file
extensions/common/url_pattern_unittest.cc.rej
Patch: extensions/common/url_pattern_unittest.cc
Index: extensions/common/url_pattern_unittest.cc
diff --git a/extensions/common/url_pattern_unittest.cc
b/extensions/common/url_pattern_unittest.cc
index
d1cc8c2103cccf01561f9723471b1ffe580bc4e6..3e0c816ac35ec2d82a15a5814ed43241b3002d87
100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
- { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" },
+ { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" },
{ "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" },
@@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) {
// Port-like strings in the path should not trigger a warning.
{ "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" },
{ "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" },
- { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" },
+ { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
@@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) {
EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
EXPECT_FALSE(pattern.MatchesURL(
GURL("filesystem:http://www.example.com:8080/foo/")));
-
EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo")));
+ EXPECT_FALSE(pattern.MatchesURL(
+ GURL("filesystem:http://www.example.com/f/foo")));
}
// Explicit port wildcard
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for extensions/common/url_pattern_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file extensions/common/url_pattern_unittest.cc
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 69.
Hunk #3 FAILED at 380.
3 out of 3 hunks FAILED -- saving rejects to file
extensions/common/url_pattern_unittest.cc.rej
Patch: extensions/common/url_pattern_unittest.cc
Index: extensions/common/url_pattern_unittest.cc
diff --git a/extensions/common/url_pattern_unittest.cc
b/extensions/common/url_pattern_unittest.cc
index
d1cc8c2103cccf01561f9723471b1ffe580bc4e6..3e0c816ac35ec2d82a15a5814ed43241b3002d87
100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
- { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" },
+ { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" },
{ "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" },
@@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) {
// Port-like strings in the path should not trigger a warning.
{ "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" },
{ "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" },
- { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" },
+ { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
@@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) {
EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
EXPECT_FALSE(pattern.MatchesURL(
GURL("filesystem:http://www.example.com:8080/foo/")));
-
EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo")));
+ EXPECT_FALSE(pattern.MatchesURL(
+ GURL("filesystem:http://www.example.com/f/foo")));
}
// Explicit port wildcard
The CQ bit was checked by haibane84@gmail.com
The CQ bit was unchecked by haibane84@gmail.com
The CQ bit was checked by haibane84@gmail.com
The CQ bit was unchecked by haibane84@gmail.com
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for extensions/common/url_pattern_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file extensions/common/url_pattern_unittest.cc
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 69.
Hunk #3 FAILED at 380.
3 out of 3 hunks FAILED -- saving rejects to file
extensions/common/url_pattern_unittest.cc.rej
Patch: extensions/common/url_pattern_unittest.cc
Index: extensions/common/url_pattern_unittest.cc
diff --git a/extensions/common/url_pattern_unittest.cc
b/extensions/common/url_pattern_unittest.cc
index
d1cc8c2103cccf01561f9723471b1ffe580bc4e6..3e0c816ac35ec2d82a15a5814ed43241b3002d87
100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
- { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" },
+ { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" },
{ "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" },
@@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) {
// Port-like strings in the path should not trigger a warning.
{ "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" },
{ "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" },
- { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" },
+ { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
@@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) {
EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
EXPECT_FALSE(pattern.MatchesURL(
GURL("filesystem:http://www.example.com:8080/foo/")));
-
EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo")));
+ EXPECT_FALSE(pattern.MatchesURL(
+ GURL("filesystem:http://www.example.com/f/foo")));
}
// Explicit port wildcard
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for extensions/common/url_pattern_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file extensions/common/url_pattern_unittest.cc
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 69.
Hunk #3 FAILED at 380.
3 out of 3 hunks FAILED -- saving rejects to file
extensions/common/url_pattern_unittest.cc.rej
Patch: extensions/common/url_pattern_unittest.cc
Index: extensions/common/url_pattern_unittest.cc
diff --git a/extensions/common/url_pattern_unittest.cc
b/extensions/common/url_pattern_unittest.cc
index
d1cc8c2103cccf01561f9723471b1ffe580bc4e6..3e0c816ac35ec2d82a15a5814ed43241b3002d87
100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
- { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" },
+ { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" },
{ "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" },
@@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) {
// Port-like strings in the path should not trigger a warning.
{ "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" },
{ "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" },
- { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" },
+ { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
@@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) {
EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
EXPECT_FALSE(pattern.MatchesURL(
GURL("filesystem:http://www.example.com:8080/foo/")));
-
EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo")));
+ EXPECT_FALSE(pattern.MatchesURL(
+ GURL("filesystem:http://www.example.com/f/foo")));
}
// Explicit port wildcard
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for extensions/common/url_pattern_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file extensions/common/url_pattern_unittest.cc
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 69.
Hunk #3 FAILED at 380.
3 out of 3 hunks FAILED -- saving rejects to file
extensions/common/url_pattern_unittest.cc.rej
Patch: extensions/common/url_pattern_unittest.cc
Index: extensions/common/url_pattern_unittest.cc
diff --git a/extensions/common/url_pattern_unittest.cc
b/extensions/common/url_pattern_unittest.cc
index
d1cc8c2103cccf01561f9723471b1ffe580bc4e6..3e0c816ac35ec2d82a15a5814ed43241b3002d87
100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -55,7 +55,7 @@ TEST(ExtensionURLPatternTest, Ports) {
{ "http://foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://*.foo:1234/", URLPattern::PARSE_SUCCESS, "1234" },
- { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS,"1234" },
+ { "http://*.foo:1234/bar", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://:1234/", URLPattern::PARSE_SUCCESS, "1234" },
{ "http://foo:/", URLPattern::PARSE_ERROR_INVALID_PORT, "*" },
{ "http://foo:*/", URLPattern::PARSE_SUCCESS, "*" },
@@ -69,7 +69,7 @@ TEST(ExtensionURLPatternTest, Ports) {
// Port-like strings in the path should not trigger a warning.
{ "http://*/:1234", URLPattern::PARSE_SUCCESS, "*" },
{ "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS, "*" },
- { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,"*" },
+ { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS, "*" },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
@@ -380,7 +380,8 @@ TEST(ExtensionURLPatternTest, Match17) {
EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
EXPECT_FALSE(pattern.MatchesURL(
GURL("filesystem:http://www.example.com:8080/foo/")));
-
EXPECT_FALSE(pattern.MatchesURL(GURL("filesystem:http://www.example.com/f/foo")));
+ EXPECT_FALSE(pattern.MatchesURL(
+ GURL("filesystem:http://www.example.com/f/foo")));
}
// Explicit port wildcard
The CQ bit was checked by haibane84@gmail.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/haibane84@gmail.com/233023002/20001
Message was sent while issue was closed.
Change committed as 263553
Message was sent while issue was closed.
A revert of this CL has been created in https://codereview.chromium.org/236083010/ by haibane84@gmail.com. The reason for reverting is: I did commit just AUTHORS file. So I will make another patch set for clean up..
Message was sent while issue was closed.
On 2014/04/14 00:38:44, jeado ko wrote: > A revert of this CL has been created in > https://codereview.chromium.org/236083010/ by mailto:haibane84@gmail.com. > > The reason for reverting is: I did commit just AUTHORS file. So I will make > another patch set for clean up.. Sorry I couldn't offer you any advice about the problem you had, I was travelling. When you get errors about the patch not applying, you need to rebase your changes locally. E.g. something like: # go back to master branch git checkout master # get up to date git fetch origin git rebase origin gclient sync # get back to work branch git checkout work_branch git rebase master You might get some conflicts with the last step that you need to resolve manually. Once you're up to date you shouldn't have any patch problems.
I did as you commented I rebase my changes locally and I reverted this commit. So I made some clean-up for new commit. Please review this.
On 2014/04/14 06:16:00, benwells wrote: > On 2014/04/14 00:38:44, jeado ko wrote: > > A revert of this CL has been created in > > https://codereview.chromium.org/236083010/ by mailto:haibane84@gmail.com. > > > > The reason for reverting is: I did commit just AUTHORS file. So I will make > > another patch set for clean up.. > > Sorry I couldn't offer you any advice about the problem you had, I was > travelling. > > When you get errors about the patch not applying, you need to rebase your > changes locally. E.g. something like: > > # go back to master branch > git checkout master > # get up to date > git fetch origin > git rebase origin > gclient sync > # get back to work branch > git checkout work_branch > git rebase master > > You might get some conflicts with the last step that you need to resolve > manually. Once you're up to date you shouldn't have any patch problems. Thanks a lot. I will try
On 2014/04/14 08:25:59, jeado ko wrote: > On 2014/04/14 06:16:00, benwells wrote: > > On 2014/04/14 00:38:44, jeado ko wrote: > > > A revert of this CL has been created in > > > https://codereview.chromium.org/236083010/ by mailto:haibane84@gmail.com. > > > > > > The reason for reverting is: I did commit just AUTHORS file. So I will make > > > another patch set for clean up.. > > > > Sorry I couldn't offer you any advice about the problem you had, I was > > travelling. > > > > When you get errors about the patch not applying, you need to rebase your > > changes locally. E.g. something like: > > > > # go back to master branch > > git checkout master > > # get up to date > > git fetch origin > > git rebase origin > > gclient sync > > # get back to work branch > > git checkout work_branch > > git rebase master > > > > You might get some conflicts with the last step that you need to resolve > > manually. Once you're up to date you shouldn't have any patch problems. > > Thanks a lot. I will try Oh. I already did. I am up to date then made some clean-up. please review my new patch set 3.
On 2014/04/14 08:27:42, jeado ko wrote: > On 2014/04/14 08:25:59, jeado ko wrote: > > On 2014/04/14 06:16:00, benwells wrote: > > > On 2014/04/14 00:38:44, jeado ko wrote: > > > > A revert of this CL has been created in > > > > https://codereview.chromium.org/236083010/ by mailto:haibane84@gmail.com. > > > > > > > > The reason for reverting is: I did commit just AUTHORS file. So I will > make > > > > another patch set for clean up.. > > > > > > Sorry I couldn't offer you any advice about the problem you had, I was > > > travelling. > > > > > > When you get errors about the patch not applying, you need to rebase your > > > changes locally. E.g. something like: > > > > > > # go back to master branch > > > git checkout master > > > # get up to date > > > git fetch origin > > > git rebase origin > > > gclient sync > > > # get back to work branch > > > git checkout work_branch > > > git rebase master > > > > > > You might get some conflicts with the last step that you need to resolve > > > manually. Once you're up to date you shouldn't have any patch problems. > > > > Thanks a lot. I will try > > Oh. I already did. I am up to date then made some clean-up. please review my new > patch set 3. I'm confused now. The original change was in url_pattern_unittest, this new patch set doesn't change that file but changes a few others instead. What happened to the url_pattern_unittest changes? It's best not to change what a CL is for, so please put this back to your original change, or just abandon this CL and start a new one.
On 2014/04/14 21:37:08, benwells wrote: > On 2014/04/14 08:27:42, jeado ko wrote: > > On 2014/04/14 08:25:59, jeado ko wrote: > > > On 2014/04/14 06:16:00, benwells wrote: > > > > On 2014/04/14 00:38:44, jeado ko wrote: > > > > > A revert of this CL has been created in > > > > > https://codereview.chromium.org/236083010/ by > mailto:haibane84@gmail.com. > > > > > > > > > > The reason for reverting is: I did commit just AUTHORS file. So I will > > make > > > > > another patch set for clean up.. > > > > > > > > Sorry I couldn't offer you any advice about the problem you had, I was > > > > travelling. > > > > > > > > When you get errors about the patch not applying, you need to rebase your > > > > changes locally. E.g. something like: > > > > > > > > # go back to master branch > > > > git checkout master > > > > # get up to date > > > > git fetch origin > > > > git rebase origin > > > > gclient sync > > > > # get back to work branch > > > > git checkout work_branch > > > > git rebase master > > > > > > > > You might get some conflicts with the last step that you need to resolve > > > > manually. Once you're up to date you shouldn't have any patch problems. > > > > > > Thanks a lot. I will try > > > > Oh. I already did. I am up to date then made some clean-up. please review my > new > > patch set 3. > > I'm confused now. The original change was in url_pattern_unittest, this new > patch set doesn't change that file but changes a few others instead. What > happened to the url_pattern_unittest changes? > > It's best not to change what a CL is for, so please put this back to your > original change, or just abandon this CL and start a new one. dear jaedo.ko. your commit description is wrong. BUG=361042 handles only cleanup for developer_private api.
On 2014/04/15 00:12:33, Sungguk Lim wrote: > On 2014/04/14 21:37:08, benwells wrote: > > On 2014/04/14 08:27:42, jeado ko wrote: > > > On 2014/04/14 08:25:59, jeado ko wrote: > > > > On 2014/04/14 06:16:00, benwells wrote: > > > > > On 2014/04/14 00:38:44, jeado ko wrote: > > > > > > A revert of this CL has been created in > > > > > > https://codereview.chromium.org/236083010/ by > > mailto:haibane84@gmail.com. > > > > > > > > > > > > The reason for reverting is: I did commit just AUTHORS file. So I will > > > make > > > > > > another patch set for clean up.. > > > > > > > > > > Sorry I couldn't offer you any advice about the problem you had, I was > > > > > travelling. > > > > > > > > > > When you get errors about the patch not applying, you need to rebase > your > > > > > changes locally. E.g. something like: > > > > > > > > > > # go back to master branch > > > > > git checkout master > > > > > # get up to date > > > > > git fetch origin > > > > > git rebase origin > > > > > gclient sync > > > > > # get back to work branch > > > > > git checkout work_branch > > > > > git rebase master > > > > > > > > > > You might get some conflicts with the last step that you need to resolve > > > > > manually. Once you're up to date you shouldn't have any patch problems. > > > > > > > > Thanks a lot. I will try > > > > > > Oh. I already did. I am up to date then made some clean-up. please review my > > new > > > patch set 3. > > > > I'm confused now. The original change was in url_pattern_unittest, this new > > patch set doesn't change that file but changes a few others instead. What > > happened to the url_pattern_unittest changes? > > > > It's best not to change what a CL is for, so please put this back to your > > original change, or just abandon this CL and start a new one. > > dear jaedo.ko. > your commit description is wrong. > BUG=361042 handles only cleanup for developer_private api. I deleted issue number. Thanks for telling that.
On 2014/04/14 21:37:08, benwells wrote: > On 2014/04/14 08:27:42, jeado ko wrote: > > On 2014/04/14 08:25:59, jeado ko wrote: > > > On 2014/04/14 06:16:00, benwells wrote: > > > > On 2014/04/14 00:38:44, jeado ko wrote: > > > > > A revert of this CL has been created in > > > > > https://codereview.chromium.org/236083010/ by > mailto:haibane84@gmail.com. > > > > > > > > > > The reason for reverting is: I did commit just AUTHORS file. So I will > > make > > > > > another patch set for clean up.. > > > > > > > > Sorry I couldn't offer you any advice about the problem you had, I was > > > > travelling. > > > > > > > > When you get errors about the patch not applying, you need to rebase your > > > > changes locally. E.g. something like: > > > > > > > > # go back to master branch > > > > git checkout master > > > > # get up to date > > > > git fetch origin > > > > git rebase origin > > > > gclient sync > > > > # get back to work branch > > > > git checkout work_branch > > > > git rebase master > > > > > > > > You might get some conflicts with the last step that you need to resolve > > > > manually. Once you're up to date you shouldn't have any patch problems. > > > > > > Thanks a lot. I will try > > > > Oh. I already did. I am up to date then made some clean-up. please review my > new > > patch set 3. > > I'm confused now. The original change was in url_pattern_unittest, this new > patch set doesn't change that file but changes a few others instead. What > happened to the url_pattern_unittest changes? > > It's best not to change what a CL is for, so please put this back to your > original change, or just abandon this CL and start a new one. After rebasing my local change, url_pattern_unittest change disappeared. before this commit, someone already made change for url_pattern_unittest I guess. As your advice, I will abandon this CL and start a new one. Thanks for your advice. |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
