Revert "Revert "Feature/managed process"" #103
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit ab119d9.
|
Hey Shantenu,
On Sun, Apr 16, 2017 at 3:20 AM, Shantenu ***@***.***> wrote:
Andre, Iain — Can you help explain this revert of a revert please?
yes. The short version is: please ignore, apologies for the noise :)
The longer version is: a pull request (PR) was accepted by accident,
and needed to be reverted. One would think that the merge commit
could be 'unapplied' - but that does not really work with git, at
least not with a distributed repository: once pushed, the 'unapply'
would confuse (and screw up) repository clones which try to sync
again. So, the PR was reverted (a negative diff was applied to undo
it).
The PR is still valid though, in the sense that it needs to be applied
eventually. Now, we can't just merge the same commits again, because
git knows they have been merged, and will simply reduce another merge
to a noop. So, we create a set of *new* commits with the same
content, and create a *new* PR which git will handle like the original
one. That commit is effectively (and also technically) the revert of
the revert above.
In other words: it's an undo + partial redo.
Cheers, Andre.
…> On Apr 14, 2017, at 8:32 PM, Andre Merzky ***@***.***>
> wrote:
>
> Reverts radical-cybertools/radical.utils#102
> <#102>
> This is the revert of the revert, and thus equivalent to the original PR
> for the feature/managed_process branch. This should be merged in sync with
> RP's feature/split_termination_4 branch. Please check #94
> <#94> for previous
> discussions on this PR.
>
> You can view, comment on, or merge this pull request online at:
>
> #103
> <#103>
> Commit Summary
>
> Revert "Revert "Feature/managed process" (#102)"
> File Changes
>
> M bin/radical-stack
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-0>
> (56)
> M bin/radical-stack-clone
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-1>
> (12)
> M setup.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-2>
> (7)
> M src/radical/utils/__init__.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-3>
> (13)
> M src/radical/utils/atfork/__init__.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-4>
> (3)
> M src/radical/utils/atfork/atfork.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-5>
> (15)
> M src/radical/utils/atfork/stdlib_fixer.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-6>
> (8)
> M src/radical/utils/debug.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-7>
> (2)
> M src/radical/utils/futures.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-8>
> (2)
> M src/radical/utils/logger.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-9>
> (15)
> M src/radical/utils/misc.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-10>
> (31)
> A src/radical/utils/process.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-11>
> (1079)
> M src/radical/utils/threads.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-12>
> (911)
> M tests/unittests/test_logger.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-13>
> (1)
> A tests/unittests/test_process.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-14>
> (233)
> M tests/unittests/test_signatures.py
> <https://github.com/radical-cybertools/radical.utils/pull/103/files#diff-15>
> (56)
> Patch Links:
>
> https://github.com/radical-cybertools/radical.utils/pull/103.patch
> <https://github.com/radical-cybertools/radical.utils/pull/103.patch>
> https://github.com/radical-cybertools/radical.utils/pull/103.diff
> <https://github.com/radical-cybertools/radical.utils/pull/103.diff>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> <#103>, or mute the
> thread
> <https://github.com/notifications/unsubscribe-auth/AAmtWYyUn2-Lidh7Wv5m9Tk9MR_0diihks5rwBAggaJpZM4M-Mvc>.
>
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or mute the thread.
--
99 little bugs in the code.
99 little bugs in the code.
Take one down, patch it around.
127 little bugs in the code...
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #102
This is the revert of the revert, and thus equivalent to the original PR for the
feature/managed_processbranch. This should be merged in sync with RP'sfeature/split_termination_4branch. Please check #94 for previous discussions on this PR.