[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    Re: Using git-svn with review board?
From:       Sebastian Kuegler <sebas () kde ! org>
Date:       2008-03-18 14:59:09
Message-ID: 200803181559.09356.sebas () kde ! org
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Tuesday 18 March 2008 15:45:27 Marijn Kruisselbrink wrote:
> Sebastian Kuegler wrote:
> > I can imagine that this forms a real barrier for some (me), but maybe
> > someone has already solved that?
>
> I'm using this small shell-script to generate a diff between the current
> working copy and HEAD that review-board will accept with git-svn. This
> does assume that HEAD is actually an svn revision, I don't think it will
> work when you have already comitted changes locally.
>
> #!/bin/sh
> REV=`git-svn find-rev HEAD`
> git-diff --no-prefix $* HEAD | sed -e 's/^+++ .*/&  (working copy)/' -e
> "s/^--- .*/&  (revision $REV)/"

My preferred workflow would be:

- Have master branch up to date from SVN
- Work on stuff in branches
- Merge changes from master into those branches as I see fit
- When something in a branch should be committed, I'd merge this commit into 
  master and dcommit it (possibly after going through RB)
- When a branch is done, I'd merge the whole branch into master and dcommit 
  that

So that involves committing locally. Changing you scriptlet to find the latest 
SVN revision would be necessary in that case, no?
-- 
sebas

 http://www.kde.org | http://vizZzion.org |  GPG Key ID: 9119 0EF9 

["signature.asc" (application/pgp-signature)]

_______________________________________________
Panel-devel mailing list
Panel-devel@kde.org
https://mail.kde.org/mailman/listinfo/panel-devel


[prev in list] [next in list] [prev in thread] [next in thread]