svn - Weird delete on merge in Subversion -

-

i have subversion repository trunk , branch. when try merge trunk branch (no matter if use tortoisesvn or commandline svn), directory , included file become marked deletion. in merge log there no incoming delete file.

if run svn status now, shows me like

d  +  path/to/directory d  +  path/to/directory/file

edit: Álvaro g. vicario pointed out, + indicates "history scheduled commit" -- mean in situation?

now scared, (because discovered accident) might have had data loss on similar merge in past without noticing. can give me hint on might have happened here?

if unsure, recommend start again , tortoisesvn. assuming didn't commit merge yet, find branch working copy and:

  1. right click on working copy root , revert.
  2. right click on working copy root , check modifications. remove unversioned items if any.
  3. right click... , merge. pick "merge range of revisions" , next. pick trunk @ "url merge from". hit show log , highlight revisions want merge. bottom panel display changed items. when happy, click ok , proceed merge.
  4. right click... , check modifications inspect committed. pay special attention "copied url" column. (right click on column headers show/hide columns.)

Comments

Post a Comment

Popular posts from this blog

c# - how to write client side events functions for the combobox items -

-
<dx:aspxcombobox id="aspxcombobox2" runat="server" clientidmode="autoid" selectedindex="-1" onselectedindexchanged="aspxcombobox1_selectedindexchanged1" > <clientsideevents selectedindexchanged="function(s, e) { grid.selectrows();}" /> <items> <dx:listedititem text="selecte rows" /> <dx:listedititem text="unselectall" /> </items> </dx:aspxcombobox> i want write event "unselect all" item in combobox. how can this? you'll need write javascript function iterates thru combo-box , marks selected items false. see select/unselect checkbox fields using pure javascript , html sample code msdn:
Read more

exception - Python, pyPdf OCR error: pyPdf.utils.PdfReadError: EOF marker not found -

-
pypdf throws exception: pypdf.utils.pdfreaderror: eof marker not found i don't need fix pypdf, need eof error cause "except" block execute , skip on file, doesn't work. still causes program stop running. background: batch ocr program pdfs python, pypdf, adobe pdf ocr error: unsupported filter /lzwdecode ... saga continues. i got 10,000 pdfs in folder. ocrd, not. can't tell 'em apart. step 1 figure out ones not ocrd , ocr (see other threads details). so i'm using pypdf. exceptions related unrecognized characters , unsupported filters when try read text. guestimated if throws exception, it's got text in , doens't go in list. problem solved, right? so: pypdf import pdffilewriter, pdffilereader import sys, os, pypdf, re path = 'c:\users\homer\documents\my pdfs' filelist = os.listdir(path) has_text_list = [] does_not_have_text_list = [] pdf_name in filelist: pdf_file
Read more