D6776: bookmarks: validate changes on push (issue6193) (BC)

mjacob added a comment. I agree (with some previous answers) that adding more stuff to `--force` should be avoided. I planned to send a proposal (and patches) after the 5.5 release for adding more detailed options that can be used instead of `--force`. However, due to unexpected

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft added a comment. As I In D6776#133068 , @marmoute wrote: > As @valentin.gatienbaron pointed out, the now avoid adding more semantic to bare `--force` with an associated `--force-bookmark` especially because we want to be able to

D6776: bookmarks: validate changes on push (issue6193) (BC)

marmoute added a comment. As @valentin.gatienbaron pointed out, the now avoid adding more semantic to bare `--force` with an associated `--force-bookmark` especially because we want to be able to select the bookmarks that get force pushed here. CHANGES SINCE LAST ACTION

D6776: bookmarks: validate changes on push (issue6193) (BC)

This revision now requires changes to proceed. baymax added a comment. baymax requested changes to this revision. There seems to have been no activities on this Diff for the past 3 Months. By policy, we are automatically moving it out of the `need-review` state. Please, move it back

D6776: bookmarks: validate changes on push (issue6193) (BC)

valentin.gatienbaron added a comment. In D6776#100506 , @durin42 wrote: > In D6776#100487 , @valentin.gatienbaron wrote: > >> I showed in D6847 the same

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16534. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16533=16534 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16533. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16531=16533 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16531. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16524=16531 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft added a comment. > Isn't that a client-side change only though, so we still need functionality on the server to reject bad pushes? (I could be missing something.) I'm actually not sure how to make this work for http, it doesn't seem to propagate `--force` to `unbundle`. Which

D6776: bookmarks: validate changes on push (issue6193) (BC)

durin42 added a comment. In D6776#100487 , @valentin.gatienbaron wrote: > I showed in D6847 the same change but implemented in exchange._processcompared. Tests pass. > I think it'd make for a simpler

D6776: bookmarks: validate changes on push (issue6193) (BC)

valentin.gatienbaron added a comment. I showed in D6847 the same change but implemented in exchange._processcompared. Tests pass. I think it'd make for a simpler final state: with the current change, the client sees that the bookmark is going to move

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16524. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16519=16524 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

pulkit added a comment. I agree with @valentin.gatienbaron that `--force` is quite generic :(. It may create new heads on the server even if I don't want to. INLINE COMMENTS > bundle2.py:2149 > +hint= > +_("run 'hg pull', resolve conflicts,

D6776: bookmarks: validate changes on push (issue6193) (BC)

durin42 added a comment. We're really close. I've uploaded my rebase of this to the latest dev hg (along with some minor test fixes). There's now only one failure: --- /Users/augie/Programming/hg/crew/tests/test-bookmarks-pushpull.t +++

D6776: bookmarks: validate changes on push (issue6193) (BC)

durin42 updated this revision to Diff 16519. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16518=16519 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES

D6776: bookmarks: validate changes on push (issue6193) (BC)

idlsoft updated this revision to Diff 16518. CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6776?vs=16515=16518 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6776/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6776 AFFECTED FILES mercurial/bundle2.py

D6776: bookmarks: validate changes on push (issue6193) (BC)

durin42 edited the summary of this revision. durin42 retitled this revision from "bookmarks: validate changes on push" to "bookmarks: validate changes on push (issue6193) (BC)". durin42 updated this revision to Diff 16515. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE