[darcs-devel] patch-index rebase 2012-07-28

[Eric Kow]

Thanks Aditya for reminding me where your current repository lives.

I've finished rebasing your changes at last

I moved away the first attempt and put the new one up at

http://hub.darcs.net/kowey/darcs-pi

I think you should do the following

1. Check that I've resolved the conflict with your screened annotate changes and your GSoC work correctly

2. Verify that any outstanding differences between this and your repository (see attached context file) are unimportant

3. Check that the contents of each individual patch is coherent/logical (that things I've bundled into a single patch belong in a single patch)

4. Switch your work to use this cleaner branch

5. Darcs send the subset of patches you think is ready for official Darcs review.

Thanks,

Eric



 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ctx.gz
Type: application/x-gzip
Size: 11320 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20120728/8229a3c2/attachment.bin>
-------------- next part --------------


On 28 Jul 2012, at 15:25, Eric Kow wrote:

> Aditya,
> 
> I've completed my second rebase exercise at
> 
> http://hub.darcs.net/kowey/darcs-pi
> 
> Basically, I think my version more or less corresponds to yours from around 2012-07-08 with patch "Refactors" plus the current screened and a conflict resolution on my part.
> 
> Unfortunately, we may have missed each other.  Your repo seems to have been removed, and as I understand it, there are quite a few changes since then.
> 
> It looks like we'll have to repeat the rebase effort again as your recent UI changes actually reverse a lot of the changes in http://hub.darcs.net/kowey/darcs-pi/patch/20120728130528-ae621
> 
> For Eric to do later on:
> -  It would probably make sense for us to cancel this patch out with your reversals so that your reviewers have a nice clean diff to look at.
> 
> For Aditya now:
> - Have a look at the patches in this repository, and see if they correspond to your intentions.  Notice also how I've tried to break things up thematically and tried to make sure that each patch was as minimal as possible, and still compiled.  I think that's the sort of cleanliness we want to shoot for.
> - It may be a good idea to try and copy your more recent changes to this new repository, but then again I don't want it to be a wasted effort either if we're going to rebase again.
> 
> If you could publish your latest work, I could see about doing a third rebase exercise later on.
> 
> -- 
> Eric Kow <http://erickow.com>
> 

-- 
Eric Kow <http://erickow.com>