Thanks Denny. This is pretty helpful for looking at the exact changes being
made.
*--*
*Tyler Romeo*
Stevens Institute of Technology, Class of 2015
Major in Computer Science
| tylerromeo(a)gmail.com
On Sat, Sep 29, 2012 at 6:46 AM, Denny Vrandečić <
denny.vrandecic(a)wikimedia.de> wrote:
Hi,
I have tried to create one changeset with the whole content handler
for your convenience:
<https://gerrit.wikimedia.org/r/#/c/25736/>
Note that is based on 7ccc77a and needs to get rebased before merge,
but the major parts should be there.
Since I am not a Git expert, I may have mad it all completely wrong. I
tried squashing, but that didn't work, so I created a diff and patched
master with it and then submitted that as a changeset to Gerrit... I
think some whitespace issue creeped in through that.
So, as said, I don't have a clue how useful or correct this changeset
is, but I hope it is somehow helping in understanding the change.
The actual change to be merged continues to be in the Wikidata branch.
Cheers,
Denny
2012/9/27 Rob Lanphier <robla(a)wikimedia.org>rg>:
On Thu, Sep 27, 2012 at 10:54 AM, Roan Kattouw
<roan.kattouw(a)gmail.com>
wrote:
> Yes and no. The person that merges the branch
can create a merge commit
and
> submit that for review (git checkout -b
mergewikidata master && git
merge
> wikidata && git review) but Gerrit
will not show the diff properly:
it'll
> either show just the conflict resolutions, or
nothing at all. You can
view
> the full diff by fetching the commit on your
localhost and using
standard
> git tools (e.g. git review -d 12345
&& git show), but you won't be able
to
use
inline comments quite as nicely.
Someone could create a faux commit (with "DO NOT MERGE" on it) which
is not a merge commit, but a fully squashed, rebased single commit.
That would give a target for inline review comments. I'm not
volunteering to do that myself, but anyone could do that, and drop a
comment on bug 38622.
Rob
_______________________________________________
Wikitech-l mailing list
Wikitech-l(a)lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikitech-l
--
Project director Wikidata
Wikimedia Deutschland e.V. | Obentrautstr. 72 | 10963 Berlin
Tel. +49-30-219 158 26-0 |
http://wikimedia.de
Wikimedia Deutschland - Gesellschaft zur Förderung Freien Wissens e.V.
Eingetragen im Vereinsregister des Amtsgerichts Berlin-Charlottenburg
unter der Nummer 23855 B. Als gemeinnützig anerkannt durch das
Finanzamt für Körperschaften I Berlin, Steuernummer 27/681/51985.
_______________________________________________
Wikitech-l mailing list
Wikitech-l(a)lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikitech-l