2008/3/18 Sebastian Kuegler <<a href="mailto:sebas@kde.org">sebas@kde.org</a>>:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div class="Ih2E3d">On Tuesday 18 March 2008 15:45:27 Marijn Kruisselbrink wrote:<br>
> Sebastian Kuegler wrote:<br>
> > I can imagine that this forms a real barrier for some (me), but maybe<br>
> > someone has already solved that?<br>
><br>
> I'm using this small shell-script to generate a diff between the current<br>
> working copy and HEAD that review-board will accept with git-svn. This<br>
> does assume that HEAD is actually an svn revision, I don't think it will<br>
> work when you have already comitted changes locally.<br>
><br>
> #!/bin/sh<br>
> REV=`git-svn find-rev HEAD`<br>
> git-diff --no-prefix $* HEAD | sed -e 's/^+++ .*/& (working copy)/' -e<br>
> "s/^--- .*/& (revision $REV)/"<br>
<br>
</div>My preferred workflow would be:<br>
<br>
- Have master branch up to date from SVN<br>
- Work on stuff in branches<br>
- Merge changes from master into those branches as I see fit</blockquote><div><br>You should rebase, not merge. ;-)<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
- When something in a branch should be committed, I'd merge this commit into<br>
master and dcommit it (possibly after going through RB)<br>
- When a branch is done, I'd merge the whole branch into master and dcommit<br>
that<br>
<br>
So that involves committing locally. Changing you scriptlet to find the latest<br>
SVN revision would be necessary in that case, no?<br>
<div><div></div><br></div></blockquote></div><br>the script looks good, you probably have to add<br>git-rev-list --date-order --max-count=1 <git-svn><br clear="all"><br>where <git-svn> is the name of the remote branch (git branch -r)<br>
which maps the svn repo. that gives you the other argument for git diff.<br><br>-Riccardo<br>-- <br>GPG key:<br>3D0F6376<br>When encrypting, please encrypt also for this subkey:<br>9EBD7FE1<br>-----<br>Pace Peace Paix Paz Frieden Pax Pokój Friður Fred Béke 和平<br>
Hasiti Lapé Hetep Malu Mир Wolakota Santiphap Irini Peoch שלום<br>Shanti Vrede Baris Rój Mír Taika Rongo Sulh Mir Py'guapy 평화