Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Not store first commit in global property #1263

Merged
merged 2 commits into from Apr 4, 2019

Conversation

magol
Copy link
Contributor

@magol magol commented Mar 8, 2019

Fix a issue that commits in a branch are lost if they are older then the first commit in a branch that are merging from this branch.

The global property "initial-changeset" is used to store the first changeset the user want to clone from.

But this is allso in some situations used to store the first changeset in a branch. This give a problem as this property is global and will be applied on all branches. If initial-changeset is set for a branch, the next cloned branch can not get the changesets before the changeset given in initial-changeset if it is not updated for that branch to.

It is problematic to use a property for different information.

The global property `InitialChangeset` is used to store the first changeset the user want to clone from.

But this was also in some situations used to store the first changeset of a branch. This cause a problem as this property is global and will be applied to all branches. If `InitialChangeset` is set for a branch, the next cloned branch can not get the changesets before the changeset given this `InitialChangeset` if it is not updated for that branch to.

It is problematic to use a property for different information.
@pmiossec pmiossec force-pushed the storeInitialChangesetInRemote branch from 6e66017 to 1e043a0 Compare April 4, 2019 09:37
@pmiossec pmiossec merged commit 405c35f into git-tfs:master Apr 4, 2019
@pmiossec
Copy link
Member

pmiossec commented Apr 4, 2019

Seems good. Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants