Hi all, In my quest to review some of Nathann's tickets, I keep hitting walls. This is part of the commit graph for ticket 15285:
* commit 8468131a81898d5a3ccfb38d9f1a3d44df15fe10 |\ Merge: 2750b79 6f247f6 | | Author: Nathann Cohen | | Date: Tue Jan 7 09:34:46 2014 +0100 | | | | trac #15285: Rebase on updated #15107 | | | * commit 6f247f6e7f3f704d30f12af082d3e8a4c2120227 | | Author: Nathann Cohen | | Date: Sat Jan 4 16:00:53 2014 +0100 | | | | trac #15107: back to the first name with a new argument | | | * commit e2935fe5ed6ade8eac039acf6f25cd0e573507fc | |\ Merge: 46eae63 cf71d58 | | | Author: Nathann Cohen | | | Date: Sat Jan 4 15:48:32 2014 +0100 | | | | | | Trac #15107: Rebase on 6.1.beta3 | | | * | | commit 2750b79c799059bf60fe31140c175b82759b90eb |\ \ \ Merge: 037277a 2ec76c7 | | | | Author: Nathann Cohen | | | | Date: Tue Jan 7 09:34:19 2014 +0100 | | | | | | | | trac 15285: rebase on 6.1.beta4 | | | | | * | | commit 2ec76c72115a01be32b8b9cb65503c152d36fd8c | | |/ Author: Nathann Cohen | |/| Date: Wed Oct 16 16:02:18 2013 +0200 | | | | | | Bug in AffineGeometryDesign | | | I've positively reviewed 6f247f6e7f3f704d30f12af082d3e8a4c2120227, which was placed on top of 6.1.beta3. But the current branch is placed on top of 6.1.beta4, so I get all those tickets too in my diff! How do I do this? Should Nathann have done his "rebase" merges at all, or are those bad practice? Am I even asking the right questions? --Stefan. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.
