Skip to content
This repository has been archived by the owner on Nov 11, 2019. It is now read-only.

[uplift simulation] Line returns are lost in the email #203

Closed
sylvestre opened this issue Feb 24, 2017 · 1 comment
Closed

[uplift simulation] Line returns are lost in the email #203

sylvestre opened this issue Feb 24, 2017 · 1 comment
Assignees
@garbas @La0
Labels
app:uplift/bot kind:bug

Comments

@sylvestre
Copy link
Contributor 

    Merge failed for commit 0e6bf137521e (parent 1f0fc9316e65)
    grafting 377756:0e6bf137521e "Bug 1321724: Change USER_NON_ADMIN access token level from whitelist to blacklist containing Admin SIDs. r=jimm" merging security/sandbox/chromium/sandbox/win/src/restricted_token.cc merging security/sandbox/chromium/sandbox/win/src/restricted_token.h merging security/sandbox/chromium/sandbox/win/src/restricted_token_utils.cc merging security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt warning: conflicts while merging security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue')
La0 added a commit to La0/mozilla-relengapi that referenced this issue Mar 6, 2017
@La0
shipit_bot_uplift: Preserve newlines on mercurial messages, refs mozi…
51b94a2 
…lla#203.
@La0 La0 mentioned this issue Mar 6, 2017
Closed
@ghost ghost added the in progress label Mar 6, 2017
La0 added a commit to La0/mozilla-relengapi that referenced this issue Mar 6, 2017
@La0
shipit_bot_uplift: Preserve newlines on mercurial messages, refs mozi…
e2962ed 
…lla#203.
garbas pushed a commit to garbas/mozilla-release-services that referenced this issue Mar 10, 2017
@La0 @garbas
shipit_bot_uplift: Preserve newlines on mercurial messages, refs mozi…
e327b75 
…lla#203.
garbas pushed a commit that referenced this issue Mar 10, 2017
@La0 @garbas
shipit_bot_uplift: Preserve newlines on mercurial messages, refs #203.
9c7bbd4
@garbas
Copy link
Contributor

garbas commented Mar 10, 2017

fixed in #210

@garbas garbas closed this as completed Mar 10, 2017
@ghost ghost assigned garbas Mar 10, 2017
@ghost ghost removed the in progress label Mar 10, 2017
@garbas garbas mentioned this issue Mar 13, 2017
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@garbas garbas

@La0 La0

Labels
app:uplift/bot kind:bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@garbas @La0 @sylvestre