hpi-swa / Squot

Squeak Object Tracker - Version control for arbitrary objects, currently with Git storage
Other
58 stars 29 forks source link

Feature Request: Option to choose all incoming editions that only have a different timestamp #368

Closed LinqLover closed 2 years ago

LinqLover commented 2 years ago

image

I just want to eliminate my only-locally different timestamps ... Especially relevant in Tonel projects because Tonel does not maintain timestamps.

j4yk commented 2 years ago

So in a way something similar to https://github.com/hpi-swa/Squot/commit/8081f2d3112ebaa3b790ebcbf1d733e363f61d29

Looks like you want to do this during a merge. What does only-locally different timestamp mean: the incoming editions have timestamps, or the incoming editions do not have timestamps? Same question for your loaded methods.

I assume you want to avoid having to click a choice when the difference is only the timestamp, is that right?

LinqLover commented 2 years ago

So in a way something similar to 8081f2d

Yes.

Looks like you want to do this during a merge.

Yes. 😅

What does only-locally different timestamp mean: the incoming editions have timestamps, or the incoming editions do not have timestamps? Same question for your loaded methods.

This was a tonel project: The local methods do have timestamps, but the incoming methods do not have them, so my expected result would be to automatically remove the local timestamps in order to clean up the working copy.

I assume you want to avoid having to click a choice when the difference is only the timestamp, is that right?

Exactly! :-)

LinqLover commented 1 year ago

@j4yk There is one caveat with the current solution: If I am not in a Tonel repository so timestamps have a meaning, when I merge commits from the remote, the default exclusions will keep the local timestamp for a method that has a different timestamp only at the remote. Unless the remote does not offer timestamps, I would prefer these ones because it helps me clean up redundant timestamps from my working copy. :)