<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>27162</bug_id>
          
          <creation_ts>2009-07-10 16:24:43 -0700</creation_ts>
          <short_desc>update-webkit should call git svn rebase and resolve-ChangeLogs -f</short_desc>
          <delta_ts>2009-12-05 13:54:19 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>PC</rep_platform>
          <op_sys>OS X 10.5</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>27355</blocked>
    
    <blocked>32181</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Eric Seidel (no email)">eric</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>abarth</cc>
    
    <cc>aroben</cc>
    
    <cc>evan</cc>
    
    <cc>levin</cc>
    
    <cc>mitz</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>131005</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-07-10 16:24:43 -0700</bug_when>
    <thetext>update-webkit should call git svn rebase and resolve-ChangeLogs -f

I just learned this from mitz:
&quot;if you use WebKitTools/Scripts/update-webkit instead of just “svn up”, it will do it for you.&quot;

So cool!  And such a great idea.  git should have the same magic. :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>169004</commentid>
    <comment_count>1</comment_count>
      <attachid>44342</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2009-12-04 18:54:09 -0800</bug_when>
    <thetext>Created attachment 44342
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>169005</commentid>
    <comment_count>2</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2009-12-04 18:55:01 -0800</bug_when>
    <thetext>style-queue ran check-webkit-style on attachment 44342 without any errors.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>169039</commentid>
    <comment_count>3</comment_count>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2009-12-05 13:21:14 -0800</bug_when>
    <thetext>I think this makes about as much sense as we can for git for the moment.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>169040</commentid>
    <comment_count>4</comment_count>
      <attachid>44342</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2009-12-05 13:54:14 -0800</bug_when>
    <thetext>Comment on attachment 44342
Patch

Clearing flags on attachment: 44342

Committed r51728: &lt;http://trac.webkit.org/changeset/51728&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>169041</commentid>
    <comment_count>5</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2009-12-05 13:54:19 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>44342</attachid>
            <date>2009-12-04 18:54:09 -0800</date>
            <delta_ts>2009-12-05 13:54:13 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-27162-20091204185408.patch</filename>
            <type>text/plain</type>
            <size>1955</size>
            <attacher name="Adam Barth">abarth</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv
ZwppbmRleCBhOGM3YzQxLi5lYmIzN2RkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM
b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMTIt
MDQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB1cGRhdGUtd2Via2l0IHNob3VsZCBjYWxsIGdp
dCBzdm4gcmViYXNlIGFuZCByZXNvbHZlLUNoYW5nZUxvZ3MgLWYKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MTYyCisKKyAgICAgICAgVGVhY2ggdXBk
YXRlLXdlYmtpdCBhYm91dCBHaXQuICBJIGRpZG4ndCBhZGQgdGhlIGNhbGwgdG8KKyAgICAgICAg
cmVzb2x2ZS1DaGFuZ2VMb2dzIC1mIGJlY2F1c2Ugc29tZXRpbWVzIHRoYXQgc2NyaXB0IGdvZXMg
YmFuYW5hcy4gIFdlCisgICAgICAgIGNhbiBpdGVyYXRlIGZyb20gaGVyZSwgaG93ZXZlci4KKwor
ICAgICAgICAqIFNjcmlwdHMvdXBkYXRlLXdlYmtpdDoKKwogMjAwOS0xMi0wNCAgWWFlbCBBaGFy
b24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBm
aXguCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgYi9XZWJL
aXRUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKaW5kZXggYjUwMzAwNC4uMmVkOWFhNCAxMDA3
NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CisrKyBiL1dlYktpdFRv
b2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdApAQCAtMzksNiArMzksNyBAQCB1c2UgVkNTVXRpbHM7
CiB1c2Ugd2Via2l0ZGlyczsKIAogc3ViIHJ1blN2blVwZGF0ZSgpOworc3ViIHJ1bkdpdFVwZGF0
ZSgpOwogCiAjIEhhbmRsZSBvcHRpb25zCiBteSAkcXVpZXQgPSAnJzsKQEAgLTQ2LDYgKzQ3LDkg
QEAgbXkgJHNob3dIZWxwOwogCiBkZXRlcm1pbmVJc0Nocm9taXVtKCk7CiAKK215ICRpc0dpdCA9
IGlzR2l0KCk7CitteSAkaXNTVk4gPSBpc1NWTigpOworCiBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9
IEdldE9wdGlvbnMoCiAgICAgJ2h8aGVscCcgID0+IFwkc2hvd0hlbHAsCiAgICAgJ3F8cXVpZXQn
ID0+IFwkcXVpZXQsCkBAIC02OSwxMiArNzMsMTQgQEAgcHVzaCBAc3ZuT3B0aW9ucywgcXcoLS1h
Y2NlcHQgcG9zdHBvbmUpIGlmIGlzU1ZOVmVyc2lvbjE2T3JOZXdlcigpOwogCiBjaGRpcldlYktp
dCgpOwogcHJpbnQgIlVwZGF0aW5nIE9wZW5Tb3VyY2VcbiIgdW5sZXNzICRxdWlldDsKLXJ1blN2
blVwZGF0ZSgpOworcnVuU3ZuVXBkYXRlKCkgaWYgJGlzU1ZOOworcnVuR2l0VXBkYXRlKCkgaWYg
JGlzR2l0OwogCiBpZiAoLWQgIi4uL0ludGVybmFsIikgewogICAgIGNoZGlyKCIuLi9JbnRlcm5h
bCIpOwogICAgIHByaW50ICJVcGRhdGluZyBJbnRlcm5hbFxuIiB1bmxlc3MgJHF1aWV0OwotICAg
IHJ1blN2blVwZGF0ZSgpOworICAgIHJ1blN2blVwZGF0ZSgpIGlmICRpc1NWTjsKKyAgICBydW5H
aXRVcGRhdGUoKSBpZiAkaXNHaXQ7CiB9IGVsc2lmIChpc0Nocm9taXVtKCkpIHsKICAgICBzeXN0
ZW0oInBlcmwiLCAiV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtIikg
PT0gMCBvciBkaWUgJCE7CiB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKQEAgLTEwNCwz
ICsxMTAsOCBAQCBzdWIgcnVuU3ZuVXBkYXRlKCkKICAgICAgICAgICAgIG9yIGRpZSAiQ291bGQg
bm90IG9wZW4gcmVzb2x2ZS1DaGFuZ2VMb2dzIHNjcmlwdDogJCEuXG4iOwogICAgIH0KIH0KKwor
c3ViIHJ1bkdpdFVwZGF0ZSgpCit7CisgICAgc3lzdGVtKCJnaXQiLCAic3ZuIiwgInJlYmFzZSIp
ID09IDAgb3IgZGllOworfQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>