[postponed] remove slower version of rcheckin #450

Closed
wants to merge 1 commit into
from

Projects

None yet

3 participants

@pmiossec
Owner

After more than 6 months of using the quick version of rcheckin (by 4 persons of my team) without problems, I think it's time to switch to quick version by default and remove the normal version of rcheckin to prevent the double maintenance...

The more you have commits to checkin, the quicker it is compare to the actual version!

Contributor
sc68cal commented Sep 25, 2013

I'm split.

On the one hand - 👍 because it gets rid of a CommandNoisy call.

On the other, my concern is what happens if someone else pushes a commit into TFS while someone is doing a long rcheckin - the rebase covers us in those cases.

Contributor
sc68cal commented Sep 25, 2013

If we could convert that CommandNoisy call into a LibGit2Sharp call - and maybe see if there is a way to do a rebase via LibGit2Sharp, that may significantly improve performance.

Owner

On the other, my concern is what happens if someone else pushes a commit into TFS while someone is doing a long rcheckin - the rebase covers us in those cases.

When you fetch a new TFS changeset not expected, both algorithms does the same and exit :

if (tfsRemote.MaxChangesetId != newChangesetId)
    throw new GitTfsException("error: New TFS changesets were found. Rcheckin was not finished.");

And both will be in the exactly same state...

PS : and I think that if someone try to checkin when another do it, I think that TFS throw an exception when try to do it...

see if there is a way to do a rebase via LibGit2Sharp, that may significantly improve performance.

No dice here. Yet.

Merge is still not available and that's a prerequisite to cherry-pick and rebase. 😿

Contributor
sc68cal commented Sep 25, 2013

When you fetch a new TFS changeset not expected, both algorithms does the same and exit

OK - sounds good to me then - just update the error message to tell them to rebase and attempt to rcheckin again.

@nulltoken Thanks for the info.

@pmiossec pmiossec changed the title from remove slower version of rcheckin to [postponed] remove slower version of rcheckin Jun 16, 2014
Owner

Postponed to the next version after merge of #620

@pmiossec pmiossec closed this Jul 10, 2014
@pmiossec pmiossec deleted the pmiossec:remove_old_rcheckin branch Jul 10, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment